Fix tests to deal with concurrent uploads.

For now, we'll also sort the mfn -- I might regret that, though.

Author: sz3

pog/pog.py

@@ -294,6 +294,7 @@ def encrypt(self, *inputs):
         args = [(filename, count, len(all_inputs)) for count, filename in enumerate(all_inputs)]
         mfn = exe.map(self.encrypt_and_store_file, args)
         mfn = dict(ChainMap(*mfn))  # smash the maps together
+        mfn = dict(sorted(mfn.items()))
 
         mfn_filename = self.save_manifest(mfn)
         _print_progress(len(all_inputs)+1, len(all_inputs)+1, mfn_filename)

tests/test_pog.py

@@ -15,6 +15,8 @@
 069:15:24 Anders (onboard): It looks like a big - looks like a big beach down there.
 '''
 
+CONCURRENCY_FLAG = '--concurrency=1'
+
 
 def compute_checksum(filename):
     hash_md5 = hashlib.md5()
@@ -51,7 +53,7 @@ class KeyfileTest(TestDirMixin, TestCase):
 
     def test_round_trip(self):
         # encrypt our sample files
-        enc = self.run_command(self.encryption_flag, self.tiny_sample, self.another_sample)
+        enc = self.run_command(self.encryption_flag, self.tiny_sample, self.another_sample, CONCURRENCY_FLAG)
         manifest_name = glob(path.join(self.working_dir.name, '*.mfn'))[0]
 
         # ordered lexicographically by filename
@@ -167,7 +169,7 @@ def test_consistency_fs_input(self):
     def test_absolute_paths(self):
         # encrypt our sample files, saving their absolute paths in the manifest
         enc = self.run_command(
-            self.encryption_flag, self.tiny_sample, self.another_sample, '--store-absolute-paths'
+            self.encryption_flag, self.tiny_sample, self.another_sample, '--store-absolute-paths', CONCURRENCY_FLAG
         )
         manifest_name = glob(path.join(self.working_dir.name, '*.mfn'))[0]
 
@@ -213,7 +215,7 @@ def test_absolute_paths(self):
     def test_glob_input_directory(self):
         # encrypt our sample files, saving their absolute paths in the manifest
         enc = self.run_command(
-            self.encryption_flag, self.input_dir.name, '--store-absolute-paths'
+            self.encryption_flag, self.input_dir.name, '--store-absolute-paths', CONCURRENCY_FLAG
         )
         manifest_name = glob(path.join(self.working_dir.name, '*.mfn'))[0]
 
@@ -250,7 +252,7 @@ def test_manifest_index_ordering(self):
         We sort the blobs stored in the manifest index, to limit information about which blobs belong together.
         '''
         # encrypt our sample files
-        enc = self.run_command(self.encryption_flag, self.tiny_sample, self.another_sample)
+        enc = self.run_command(self.encryption_flag, self.tiny_sample, self.another_sample, CONCURRENCY_FLAG)
         manifest_name = glob(path.join(self.working_dir.name, '*.mfn'))[0]
 
         self.assertEqual(enc, [