summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com>2016-05-25 03:30:47 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-06-02 08:24:01 +0100
commit89d40a1f930c046b3cde1f3b4d1bdda0cadc70f5 (patch)
tree6ecf2b5ed30516d79a79a0ea1cce9e8f509c181e
parent3b3997174831931ea472167ba6cc854a4972ccce (diff)
downloadpoky-89d40a1f930c046b3cde1f3b4d1bdda0cadc70f5.tar.gz
selftest/devtool: Compare sets instead of arrays on AssertEqual
Sets are safer when comparing internal elements and positions are not important. This commit avoid errors observed on python3 builds as reported on the below bugzilla entry. [YOCTO #9661] (From OE-Core rev: f6df164d09a4d4cf58977bf6cc0bc4f4bc71183a) Signed-off-by: Leonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oeqa/selftest/devtool.py32
1 files changed, 16 insertions, 16 deletions
diff --git a/meta/lib/oeqa/selftest/devtool.py b/meta/lib/oeqa/selftest/devtool.py
index 6d2417ee4f..deb30906b7 100644
--- a/meta/lib/oeqa/selftest/devtool.py
+++ b/meta/lib/oeqa/selftest/devtool.py
@@ -818,28 +818,28 @@ class DevtoolTests(DevtoolBase):
818 818
819 # Check bbappend contents 819 # Check bbappend contents
820 result = runCmd('git rev-parse HEAD', cwd=tempsrcdir) 820 result = runCmd('git rev-parse HEAD', cwd=tempsrcdir)
821 expectedlines = ['SRCREV = "%s"\n' % result.output, 821 expectedlines = set(['SRCREV = "%s"\n' % result.output,
822 '\n', 822 '\n',
823 'SRC_URI = "%s"\n' % git_uri, 823 'SRC_URI = "%s"\n' % git_uri,
824 '\n'] 824 '\n'])
825 with open(bbappendfile, 'r') as f: 825 with open(bbappendfile, 'r') as f:
826 self.assertEqual(expectedlines, f.readlines()) 826 self.assertEqual(expectedlines, set(f.readlines()))
827 827
828 # Check we can run it again and bbappend isn't modified 828 # Check we can run it again and bbappend isn't modified
829 result = runCmd('devtool update-recipe -m srcrev %s -a %s' % (testrecipe, templayerdir)) 829 result = runCmd('devtool update-recipe -m srcrev %s -a %s' % (testrecipe, templayerdir))
830 with open(bbappendfile, 'r') as f: 830 with open(bbappendfile, 'r') as f:
831 self.assertEqual(expectedlines, f.readlines()) 831 self.assertEqual(expectedlines, set(f.readlines()))
832 # Drop new commit and check SRCREV changes 832 # Drop new commit and check SRCREV changes
833 result = runCmd('git reset HEAD^', cwd=tempsrcdir) 833 result = runCmd('git reset HEAD^', cwd=tempsrcdir)
834 result = runCmd('devtool update-recipe -m srcrev %s -a %s' % (testrecipe, templayerdir)) 834 result = runCmd('devtool update-recipe -m srcrev %s -a %s' % (testrecipe, templayerdir))
835 self.assertFalse(os.path.exists(os.path.join(appenddir, testrecipe)), 'Patch directory should not be created') 835 self.assertFalse(os.path.exists(os.path.join(appenddir, testrecipe)), 'Patch directory should not be created')
836 result = runCmd('git rev-parse HEAD', cwd=tempsrcdir) 836 result = runCmd('git rev-parse HEAD', cwd=tempsrcdir)
837 expectedlines = ['SRCREV = "%s"\n' % result.output, 837 expectedlines = set(['SRCREV = "%s"\n' % result.output,
838 '\n', 838 '\n',
839 'SRC_URI = "%s"\n' % git_uri, 839 'SRC_URI = "%s"\n' % git_uri,
840 '\n'] 840 '\n'])
841 with open(bbappendfile, 'r') as f: 841 with open(bbappendfile, 'r') as f:
842 self.assertEqual(expectedlines, f.readlines()) 842 self.assertEqual(expectedlines, set(f.readlines()))
843 # Put commit back and check we can run it if layer isn't in bblayers.conf 843 # Put commit back and check we can run it if layer isn't in bblayers.conf
844 os.remove(bbappendfile) 844 os.remove(bbappendfile)
845 result = runCmd('git commit -a -m "Change the Makefile"', cwd=tempsrcdir) 845 result = runCmd('git commit -a -m "Change the Makefile"', cwd=tempsrcdir)
@@ -848,12 +848,12 @@ class DevtoolTests(DevtoolBase):
848 self.assertIn('WARNING: Specified layer is not currently enabled in bblayers.conf', result.output) 848 self.assertIn('WARNING: Specified layer is not currently enabled in bblayers.conf', result.output)
849 self.assertFalse(os.path.exists(os.path.join(appenddir, testrecipe)), 'Patch directory should not be created') 849 self.assertFalse(os.path.exists(os.path.join(appenddir, testrecipe)), 'Patch directory should not be created')
850 result = runCmd('git rev-parse HEAD', cwd=tempsrcdir) 850 result = runCmd('git rev-parse HEAD', cwd=tempsrcdir)
851 expectedlines = ['SRCREV = "%s"\n' % result.output, 851 expectedlines = set(['SRCREV = "%s"\n' % result.output,
852 '\n', 852 '\n',
853 'SRC_URI = "%s"\n' % git_uri, 853 'SRC_URI = "%s"\n' % git_uri,
854 '\n'] 854 '\n'])
855 with open(bbappendfile, 'r') as f: 855 with open(bbappendfile, 'r') as f:
856 self.assertEqual(expectedlines, f.readlines()) 856 self.assertEqual(expectedlines, set(f.readlines()))
857 # Deleting isn't expected to work under these circumstances 857 # Deleting isn't expected to work under these circumstances
858 858
859 @testcase(1370) 859 @testcase(1370)