Control: tags -1 patch

os.listdir turns out to return in undefined order. So that needs
sorting. I created a patch, could you please try it out? I verified it
on amd64.

Paul

diff --git a/tests/autopkgtest b/tests/autopkgtest
index ca6967a7..e37e504e 100755
--- a/tests/autopkgtest
+++ b/tests/autopkgtest
@@ -1956,8 +1956,8 @@ deb [trusted=yes arch=6510] http://foo.ubuntu.com/ fluffy-proposed main 6510
 ''')
 
         # should set up apt pinning
-        self.assertEqual(os.listdir(os.path.join(apt_dir, 'preferences.d')),
-                         ['autopkgtest-fluffy-proposed', 'autopkgtest-default-release'])
+        self.assertEqual(sorted(os.listdir(os.path.join(apt_dir, 'preferences.d'))),
+                         ['autopkgtest-default-release', 'autopkgtest-fluffy-proposed'])
         with open(os.path.join(apt_dir, 'preferences.d', 'autopkgtest-fluffy-proposed')) as f:
             self.assertEqual(f.read(), '''Package: foo bar
 Pin: release a=fluffy-proposed
@@ -2058,8 +2058,8 @@ deb http://foo.ubuntu.com/ fluffy main non-free
         self.assertRegex(out, 'pass\s+PASS', out)
 
         # should set up apt pinning
-        self.assertEqual(os.listdir(os.path.join(apt_dir, 'preferences.d')),
-                         ['autopkgtest-fluffy-proposed', 'autopkgtest-default-release'])
+        self.assertEqual(sorted(os.listdir(os.path.join(apt_dir, 'preferences.d'))),
+                         ['autopkgtest-default-release', 'autopkgtest-fluffy-proposed'])
         with open(os.path.join(apt_dir, 'preferences.d', 'autopkgtest-fluffy-proposed')) as f:
             self.assertEqual(f.read(), '''Package: foo bar
 Pin: release a=fluffy-proposed

Attachment: signature.asc
Description: OpenPGP digital signature

Reply via email to