From 8061f30e6fa58d22ed1a52e02c4d9c7f0bf132cf Mon Sep 17 00:00:00 2001 From: Kelly Brazil Date: Tue, 1 Feb 2022 16:16:33 -0800 Subject: [PATCH] add centos -i nochange test --- .../centos-7.7/rsync-ivvv-nochange.json | 1 + .../centos-7.7/rsync-ivvv-nochange.out | 224 ++++++++++++++++++ tests/test_rsync.py | 17 +- 3 files changed, 236 insertions(+), 6 deletions(-) create mode 100644 tests/fixtures/centos-7.7/rsync-ivvv-nochange.json create mode 100644 tests/fixtures/centos-7.7/rsync-ivvv-nochange.out diff --git a/tests/fixtures/centos-7.7/rsync-ivvv-nochange.json b/tests/fixtures/centos-7.7/rsync-ivvv-nochange.json new file mode 100644 index 00000000..63e991dc --- /dev/null +++ b/tests/fixtures/centos-7.7/rsync-ivvv-nochange.json @@ -0,0 +1 @@ +[{"summary":{"sent":611,"received":4043,"bytes_sec":9308.0,"total_size":218258163,"speedup":46896.9},"files":[{"filename":"./","metadata":".d ","update_type":"not updated","file_type":"directory","checksum_or_value_different":null,"size_different":null,"modification_time_different":null,"permissions_different":null,"owner_different":null,"group_different":null,"acl_different":null,"extended_attribute_different":null},{"filename":"a.txt","metadata":".f ","update_type":"not updated","file_type":"file","checksum_or_value_different":null,"size_different":null,"modification_time_different":null,"permissions_different":null,"owner_different":null,"group_different":null,"acl_different":null,"extended_attribute_different":null},{"filename":"b.txt","metadata":".f ","update_type":"not updated","file_type":"file","checksum_or_value_different":null,"size_different":null,"modification_time_different":null,"permissions_different":null,"owner_different":null,"group_different":null,"acl_different":null,"extended_attribute_different":null},{"filename":"c.txt","metadata":".f ","update_type":"not updated","file_type":"file","checksum_or_value_different":null,"size_different":null,"modification_time_different":null,"permissions_different":null,"owner_different":null,"group_different":null,"acl_different":null,"extended_attribute_different":null},{"filename":"d.txt","metadata":".f ","update_type":"not updated","file_type":"file","checksum_or_value_different":null,"size_different":null,"modification_time_different":null,"permissions_different":null,"owner_different":null,"group_different":null,"acl_different":null,"extended_attribute_different":null},{"filename":"file with spaces.txt","metadata":".f ","update_type":"not updated","file_type":"file","checksum_or_value_different":null,"size_different":null,"modification_time_different":null,"permissions_different":null,"owner_different":null,"group_different":null,"acl_different":null,"extended_attribute_different":null},{"filename":"pyspark-2.4.5-py2.py3-none-any.whl","metadata":".f ","update_type":"not updated","file_type":"file","checksum_or_value_different":null,"size_different":null,"modification_time_different":null,"permissions_different":null,"owner_different":null,"group_different":null,"acl_different":null,"extended_attribute_different":null},{"filename":"folder/","metadata":".d ","update_type":"not updated","file_type":"directory","checksum_or_value_different":null,"size_different":null,"modification_time_different":null,"permissions_different":null,"owner_different":null,"group_different":null,"acl_different":null,"extended_attribute_different":null},{"filename":"folder/file1","metadata":".f ","update_type":"not updated","file_type":"file","checksum_or_value_different":null,"size_different":null,"modification_time_different":null,"permissions_different":null,"owner_different":null,"group_different":null,"acl_different":null,"extended_attribute_different":null},{"filename":"folder/file10","metadata":".f ","update_type":"not updated","file_type":"file","checksum_or_value_different":null,"size_different":null,"modification_time_different":null,"permissions_different":null,"owner_different":null,"group_different":null,"acl_different":null,"extended_attribute_different":null},{"filename":"folder/file11","metadata":".f ","update_type":"not updated","file_type":"file","checksum_or_value_different":null,"size_different":null,"modification_time_different":null,"permissions_different":null,"owner_different":null,"group_different":null,"acl_different":null,"extended_attribute_different":null},{"filename":"folder/file12","metadata":".f ","update_type":"not updated","file_type":"file","checksum_or_value_different":null,"size_different":null,"modification_time_different":null,"permissions_different":null,"owner_different":null,"group_different":null,"acl_different":null,"extended_attribute_different":null},{"filename":"folder/file13","metadata":".f ","update_type":"not updated","file_type":"file","checksum_or_value_different":null,"size_different":null,"modification_time_different":null,"permissions_different":null,"owner_different":null,"group_different":null,"acl_different":null,"extended_attribute_different":null},{"filename":"folder/file14","metadata":".f ","update_type":"not updated","file_type":"file","checksum_or_value_different":null,"size_different":null,"modification_time_different":null,"permissions_different":null,"owner_different":null,"group_different":null,"acl_different":null,"extended_attribute_different":null},{"filename":"folder/file15","metadata":".f ","update_type":"not updated","file_type":"file","checksum_or_value_different":null,"size_different":null,"modification_time_different":null,"permissions_different":null,"owner_different":null,"group_different":null,"acl_different":null,"extended_attribute_different":null},{"filename":"folder/file16","metadata":".f ","update_type":"not updated","file_type":"file","checksum_or_value_different":null,"size_different":null,"modification_time_different":null,"permissions_different":null,"owner_different":null,"group_different":null,"acl_different":null,"extended_attribute_different":null},{"filename":"folder/file17","metadata":".f ","update_type":"not updated","file_type":"file","checksum_or_value_different":null,"size_different":null,"modification_time_different":null,"permissions_different":null,"owner_different":null,"group_different":null,"acl_different":null,"extended_attribute_different":null},{"filename":"folder/file18","metadata":".f ","update_type":"not updated","file_type":"file","checksum_or_value_different":null,"size_different":null,"modification_time_different":null,"permissions_different":null,"owner_different":null,"group_different":null,"acl_different":null,"extended_attribute_different":null},{"filename":"folder/file19","metadata":".f ","update_type":"not updated","file_type":"file","checksum_or_value_different":null,"size_different":null,"modification_time_different":null,"permissions_different":null,"owner_different":null,"group_different":null,"acl_different":null,"extended_attribute_different":null},{"filename":"folder/file2","metadata":".f ","update_type":"not updated","file_type":"file","checksum_or_value_different":null,"size_different":null,"modification_time_different":null,"permissions_different":null,"owner_different":null,"group_different":null,"acl_different":null,"extended_attribute_different":null},{"filename":"folder/file20","metadata":".f ","update_type":"not updated","file_type":"file","checksum_or_value_different":null,"size_different":null,"modification_time_different":null,"permissions_different":null,"owner_different":null,"group_different":null,"acl_different":null,"extended_attribute_different":null},{"filename":"folder/file3","metadata":".f ","update_type":"not updated","file_type":"file","checksum_or_value_different":null,"size_different":null,"modification_time_different":null,"permissions_different":null,"owner_different":null,"group_different":null,"acl_different":null,"extended_attribute_different":null},{"filename":"folder/file4","metadata":".f ","update_type":"not updated","file_type":"file","checksum_or_value_different":null,"size_different":null,"modification_time_different":null,"permissions_different":null,"owner_different":null,"group_different":null,"acl_different":null,"extended_attribute_different":null},{"filename":"folder/file5","metadata":".f ","update_type":"not updated","file_type":"file","checksum_or_value_different":null,"size_different":null,"modification_time_different":null,"permissions_different":null,"owner_different":null,"group_different":null,"acl_different":null,"extended_attribute_different":null},{"filename":"folder/file6","metadata":".f ","update_type":"not updated","file_type":"file","checksum_or_value_different":null,"size_different":null,"modification_time_different":null,"permissions_different":null,"owner_different":null,"group_different":null,"acl_different":null,"extended_attribute_different":null},{"filename":"folder/file7","metadata":".f ","update_type":"not updated","file_type":"file","checksum_or_value_different":null,"size_different":null,"modification_time_different":null,"permissions_different":null,"owner_different":null,"group_different":null,"acl_different":null,"extended_attribute_different":null},{"filename":"folder/file8","metadata":".f ","update_type":"not updated","file_type":"file","checksum_or_value_different":null,"size_different":null,"modification_time_different":null,"permissions_different":null,"owner_different":null,"group_different":null,"acl_different":null,"extended_attribute_different":null},{"filename":"folder/file9","metadata":".f ","update_type":"not updated","file_type":"file","checksum_or_value_different":null,"size_different":null,"modification_time_different":null,"permissions_different":null,"owner_different":null,"group_different":null,"acl_different":null,"extended_attribute_different":null}]}] diff --git a/tests/fixtures/centos-7.7/rsync-ivvv-nochange.out b/tests/fixtures/centos-7.7/rsync-ivvv-nochange.out new file mode 100644 index 00000000..d368274a --- /dev/null +++ b/tests/fixtures/centos-7.7/rsync-ivvv-nochange.out @@ -0,0 +1,224 @@ +sending incremental file list +[sender] make_file(.,*,0) +[sender] pushing local filters for /home/kbrazil/rsynctest/source/ +[sender] make_file(a.txt,*,2) +[sender] make_file(b.txt,*,2) +[sender] make_file(c.txt,*,2) +[sender] make_file(d.txt,*,2) +[sender] make_file(file with spaces.txt,*,2) +[sender] make_file(folder,*,2) +[sender] make_file(pyspark-2.4.5-py2.py3-none-any.whl,*,2) +send_file_list done +send_files starting +[sender] pushing local filters for /home/kbrazil/rsynctest/source/folder/ +[sender] make_file(folder/file1,*,2) +[sender] make_file(folder/file2,*,2) +[sender] make_file(folder/file3,*,2) +[sender] make_file(folder/file4,*,2) +[sender] make_file(folder/file5,*,2) +[sender] make_file(folder/file6,*,2) +[sender] make_file(folder/file7,*,2) +[sender] make_file(folder/file8,*,2) +[sender] make_file(folder/file9,*,2) +[sender] make_file(folder/file10,*,2) +[sender] make_file(folder/file11,*,2) +[sender] make_file(folder/file12,*,2) +[sender] make_file(folder/file13,*,2) +[sender] make_file(folder/file14,*,2) +[sender] make_file(folder/file15,*,2) +[sender] make_file(folder/file16,*,2) +[sender] make_file(folder/file17,*,2) +[sender] make_file(folder/file18,*,2) +[sender] make_file(folder/file19,*,2) +[sender] make_file(folder/file20,*,2) +server_recv(2) starting pid=58141 +recv_file_name(.) +recv_file_name(a.txt) +recv_file_name(b.txt) +recv_file_name(c.txt) +recv_file_name(d.txt) +recv_file_name(file with spaces.txt) +recv_file_name(folder) +recv_file_name(pyspark-2.4.5-py2.py3-none-any.whl) +received 8 names +recv_file_list done +get_local_name count=8 dest +generator starting pid=58141 +delta-transmission disabled for local transfer or --whole-file +recv_generator(.,0) +recv_generator(.,1) +recv_generator(a.txt,2) +recv_generator(b.txt,3) +recv_generator(c.txt,4) +recv_generator(d.txt,5) +recv_generator(file with spaces.txt,6) +recv_generator(pyspark-2.4.5-py2.py3-none-any.whl,7) +recv_generator(folder,8) +send_files(0, source/.) +.d ./ +send_files(2, source/a.txt) +.f a.txt +send_files(3, source/b.txt) +.f b.txt +send_files(4, source/c.txt) +.f c.txt +send_files(5, source/d.txt) +.f d.txt +send_files(6, source/file with spaces.txt) +.f file with spaces.txt +send_files(7, source/pyspark-2.4.5-py2.py3-none-any.whl) +.f pyspark-2.4.5-py2.py3-none-any.whl +recv_files(8) starting +[receiver] receiving flist for dir 1 +recv_file_name(folder/file1) +recv_file_name(folder/file2) +recv_file_name(folder/file3) +recv_file_name(folder/file4) +recv_file_name(folder/file5) +recv_file_name(folder/file6) +recv_file_name(folder/file7) +recv_file_name(folder/file8) +recv_file_name(folder/file9) +recv_file_name(folder/file10) +recv_file_name(folder/file11) +recv_file_name(folder/file12) +recv_file_name(folder/file13) +recv_file_name(folder/file14) +recv_file_name(folder/file15) +recv_file_name(folder/file16) +recv_file_name(folder/file17) +recv_file_name(folder/file18) +recv_file_name(folder/file19) +recv_file_name(folder/file20) +received 20 names +recv_file_list done +recv_files(.) +recv_files(a.txt) +recv_files(b.txt) +recv_files(c.txt) +recv_files(d.txt) +recv_files(file with spaces.txt) +recv_files(pyspark-2.4.5-py2.py3-none-any.whl) +[generator] receiving flist for dir 1 +recv_file_name(folder/file1) +recv_file_name(folder/file2) +recv_file_name(folder/file3) +recv_file_name(folder/file4) +recv_file_name(folder/file5) +recv_file_name(folder/file6) +recv_file_name(folder/file7) +recv_file_name(folder/file8) +recv_file_name(folder/file9) +recv_file_name(folder/file10) +recv_file_name(folder/file11) +recv_file_name(folder/file12) +recv_file_name(folder/file13) +recv_file_name(folder/file14) +recv_file_name(folder/file15) +recv_file_name(folder/file16) +recv_file_name(folder/file17) +recv_file_name(folder/file18) +recv_file_name(folder/file19) +recv_file_name(folder/file20) +received 20 names +recv_file_list done +recv_generator(folder,9) +recv_generator(folder/file1,10) +recv_generator(folder/file10,11) +recv_generator(folder/file11,12) +recv_generator(folder/file12,13) +recv_generator(folder/file13,14) +recv_generator(folder/file14,15) +recv_generator(folder/file15,16) +recv_generator(folder/file16,17) +recv_generator(folder/file17,18) +recv_generator(folder/file18,19) +recv_generator(folder/file19,20) +recv_generator(folder/file2,21) +recv_generator(folder/file20,22) +recv_generator(folder/file3,23) +recv_generator(folder/file4,24) +recv_generator(folder/file5,25) +recv_generator(folder/file6,26) +recv_generator(folder/file7,27) +recv_generator(folder/file8,28) +recv_generator(folder/file9,29) +generate_files phase=1 +send_files(9, source/folder) +.d folder/ +send_files(10, source/folder/file1) +.f folder/file1 +send_files(11, source/folder/file10) +.f folder/file10 +send_files(12, source/folder/file11) +.f folder/file11 +send_files(13, source/folder/file12) +.f folder/file12 +send_files(14, source/folder/file13) +.f folder/file13 +send_files(15, source/folder/file14) +.f folder/file14 +send_files(16, source/folder/file15) +.f folder/file15 +send_files(17, source/folder/file16) +.f folder/file16 +send_files(18, source/folder/file17) +.f folder/file17 +send_files(19, source/folder/file18) +.f folder/file18 +send_files(20, source/folder/file19) +.f folder/file19 +send_files(21, source/folder/file2) +.f folder/file2 +send_files(22, source/folder/file20) +.f folder/file20 +send_files(23, source/folder/file3) +.f folder/file3 +send_files(24, source/folder/file4) +.f folder/file4 +send_files(25, source/folder/file5) +.f folder/file5 +send_files(26, source/folder/file6) +.f folder/file6 +send_files(27, source/folder/file7) +.f folder/file7 +send_files(28, source/folder/file8) +.f folder/file8 +send_files(29, source/folder/file9) +.f folder/file9 +send_files phase=1 +recv_files(folder) +recv_files(folder/file1) +recv_files(folder/file10) +recv_files(folder/file11) +recv_files(folder/file12) +recv_files(folder/file13) +recv_files(folder/file14) +recv_files(folder/file15) +recv_files(folder/file16) +recv_files(folder/file17) +recv_files(folder/file18) +recv_files(folder/file19) +recv_files(folder/file2) +recv_files(folder/file20) +recv_files(folder/file3) +recv_files(folder/file4) +recv_files(folder/file5) +recv_files(folder/file6) +recv_files(folder/file7) +recv_files(folder/file8) +recv_files(folder/file9) +recv_files phase=1 +generate_files phase=2 +send_files phase=2 +send files finished +total: matches=0 hash_hits=0 false_alarms=0 data=0 +recv_files phase=2 +recv_files finished +generate_files phase=3 +generate_files finished + +sent 611 bytes received 4,043 bytes 9,308.00 bytes/sec +total size is 218,258,163 speedup is 46,896.90 +[sender] _exit_cleanup(code=0, file=main.c, line=1178): about to call exit(0) + diff --git a/tests/test_rsync.py b/tests/test_rsync.py index 92764f53..bf628643 100644 --- a/tests/test_rsync.py +++ b/tests/test_rsync.py @@ -22,11 +22,12 @@ class MyTests(unittest.TestCase): with open(os.path.join(THIS_DIR, os.pardir, 'tests/fixtures/osx-10.14.6/rsync-i-vvv.out'), 'r', encoding='utf-8') as f: self.osx_10_14_6_rsync_ivvv = f.read() + with open(os.path.join(THIS_DIR, os.pardir, 'tests/fixtures/centos-7.7/rsync-ivvv-nochange.out'), 'r', encoding='utf-8') as f: + self.centos_7_7_rsync_ivvv_nochange = f.read() + with open(os.path.join(THIS_DIR, os.pardir, 'tests/fixtures/osx-10.14.6/rsync-i-vvv-nochange.out'), 'r', encoding='utf-8') as f: self.osx_10_14_6_rsync_ivvv_nochange = f.read() - - with open(os.path.join(THIS_DIR, os.pardir, 'tests/fixtures/centos-7.7/rsync-i-logfile.out'), 'r', encoding='utf-8') as f: self.centos_7_7_rsync_i_logfile = f.read() @@ -55,16 +56,15 @@ class MyTests(unittest.TestCase): with open(os.path.join(THIS_DIR, os.pardir, 'tests/fixtures/centos-7.7/rsync-ivvv.json'), 'r', encoding='utf-8') as f: self.centos_7_7_rsync_ivvv_json = json.loads(f.read()) - with open(os.path.join(THIS_DIR, os.pardir, 'tests/fixtures/osx-10.14.6/rsync-i-vvv.json'), 'r', encoding='utf-8') as f: self.osx_10_14_6_rsync_ivvv_json = json.loads(f.read()) + with open(os.path.join(THIS_DIR, os.pardir, 'tests/fixtures/centos-7.7/rsync-ivvv-nochange.json'), 'r', encoding='utf-8') as f: + self.centos_7_7_rsync_ivvv_nochange_json = json.loads(f.read()) with open(os.path.join(THIS_DIR, os.pardir, 'tests/fixtures/osx-10.14.6/rsync-i-vvv-nochange.json'), 'r', encoding='utf-8') as f: self.osx_10_14_6_rsync_ivvv_nochange_json = json.loads(f.read()) - - with open(os.path.join(THIS_DIR, os.pardir, 'tests/fixtures/centos-7.7/rsync-i-logfile.json'), 'r', encoding='utf-8') as f: self.centos_7_7_rsync_i_logfile_json = json.loads(f.read()) @@ -107,7 +107,6 @@ class MyTests(unittest.TestCase): """ self.assertEqual(jc.parsers.rsync.parse(self.centos_7_7_rsync_ivvv, quiet=True), self.centos_7_7_rsync_ivvv_json) - def test_rsync_osx_10_14_6_rsync_ivvv(self): """ Test 'rsync -ivvv' on OSX 10.14.6 @@ -119,6 +118,12 @@ class MyTests(unittest.TestCase): Test 'rsync -ivvv' on OSX 10.14.6 with no file changes """ self.assertEqual(jc.parsers.rsync.parse(self.osx_10_14_6_rsync_ivvv_nochange, quiet=True), self.osx_10_14_6_rsync_ivvv_nochange_json) + + def test_rsync_centos_7_7_rsync_ivvv_nochange(self): + """ + Test 'rsync -ivvv' on Centos 7.7 with no file changes + """ + self.assertEqual(jc.parsers.rsync.parse(self.centos_7_7_rsync_ivvv_nochange, quiet=True), self.centos_7_7_rsync_ivvv_nochange_json) def test_rsync_centos_7_7_rsync_i_logfile(self): """