diff options
Diffstat (limited to 'meta/lib/oeqa/selftest/cases/devtool.py')
-rw-r--r-- | meta/lib/oeqa/selftest/cases/devtool.py | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/meta/lib/oeqa/selftest/cases/devtool.py b/meta/lib/oeqa/selftest/cases/devtool.py index 58f3e58461..48fc042904 100644 --- a/meta/lib/oeqa/selftest/cases/devtool.py +++ b/meta/lib/oeqa/selftest/cases/devtool.py | |||
@@ -9,7 +9,6 @@ import oeqa.utils.ftools as ftools | |||
9 | from oeqa.selftest.case import OESelftestTestCase | 9 | from oeqa.selftest.case import OESelftestTestCase |
10 | from oeqa.utils.commands import runCmd, bitbake, get_bb_var, create_temp_layer | 10 | from oeqa.utils.commands import runCmd, bitbake, get_bb_var, create_temp_layer |
11 | from oeqa.utils.commands import get_bb_vars, runqemu, get_test_layer | 11 | from oeqa.utils.commands import get_bb_vars, runqemu, get_test_layer |
12 | from oeqa.core.decorator.oeid import OETestID | ||
13 | 12 | ||
14 | oldmetapath = None | 13 | oldmetapath = None |
15 | 14 | ||
@@ -233,7 +232,6 @@ class DevtoolBase(OESelftestTestCase): | |||
233 | 232 | ||
234 | class DevtoolTests(DevtoolBase): | 233 | class DevtoolTests(DevtoolBase): |
235 | 234 | ||
236 | @OETestID(1158) | ||
237 | def test_create_workspace(self): | 235 | def test_create_workspace(self): |
238 | # Check preconditions | 236 | # Check preconditions |
239 | result = runCmd('bitbake-layers show-layers') | 237 | result = runCmd('bitbake-layers show-layers') |
@@ -256,7 +254,6 @@ class DevtoolTests(DevtoolBase): | |||
256 | 254 | ||
257 | class DevtoolAddTests(DevtoolBase): | 255 | class DevtoolAddTests(DevtoolBase): |
258 | 256 | ||
259 | @OETestID(1159) | ||
260 | def test_devtool_add(self): | 257 | def test_devtool_add(self): |
261 | # Fetch source | 258 | # Fetch source |
262 | tempdir = tempfile.mkdtemp(prefix='devtoolqa') | 259 | tempdir = tempfile.mkdtemp(prefix='devtoolqa') |
@@ -298,7 +295,6 @@ class DevtoolAddTests(DevtoolBase): | |||
298 | bindir = bindir[1:] | 295 | bindir = bindir[1:] |
299 | self.assertTrue(os.path.isfile(os.path.join(installdir, bindir, 'pv')), 'pv binary not found in D') | 296 | self.assertTrue(os.path.isfile(os.path.join(installdir, bindir, 'pv')), 'pv binary not found in D') |
300 | 297 | ||
301 | @OETestID(1423) | ||
302 | def test_devtool_add_git_local(self): | 298 | def test_devtool_add_git_local(self): |
303 | # We need dbus built so that DEPENDS recognition works | 299 | # We need dbus built so that DEPENDS recognition works |
304 | bitbake('dbus') | 300 | bitbake('dbus') |
@@ -340,7 +336,6 @@ class DevtoolAddTests(DevtoolBase): | |||
340 | checkvars['DEPENDS'] = set(['dbus']) | 336 | checkvars['DEPENDS'] = set(['dbus']) |
341 | self._test_recipe_contents(recipefile, checkvars, []) | 337 | self._test_recipe_contents(recipefile, checkvars, []) |
342 | 338 | ||
343 | @OETestID(1162) | ||
344 | def test_devtool_add_library(self): | 339 | def test_devtool_add_library(self): |
345 | # Fetch source | 340 | # Fetch source |
346 | tempdir = tempfile.mkdtemp(prefix='devtoolqa') | 341 | tempdir = tempfile.mkdtemp(prefix='devtoolqa') |
@@ -389,7 +384,6 @@ class DevtoolAddTests(DevtoolBase): | |||
389 | self.assertFalse(matches, 'Stamp files exist for recipe libftdi that should have been cleaned') | 384 | self.assertFalse(matches, 'Stamp files exist for recipe libftdi that should have been cleaned') |
390 | self.assertFalse(os.path.isfile(os.path.join(staging_libdir, 'libftdi1.so.2.1.0')), 'libftdi binary still found in STAGING_LIBDIR after cleaning') | 385 | self.assertFalse(os.path.isfile(os.path.join(staging_libdir, 'libftdi1.so.2.1.0')), 'libftdi binary still found in STAGING_LIBDIR after cleaning') |
391 | 386 | ||
392 | @OETestID(1160) | ||
393 | def test_devtool_add_fetch(self): | 387 | def test_devtool_add_fetch(self): |
394 | # Fetch source | 388 | # Fetch source |
395 | tempdir = tempfile.mkdtemp(prefix='devtoolqa') | 389 | tempdir = tempfile.mkdtemp(prefix='devtoolqa') |
@@ -435,7 +429,6 @@ class DevtoolAddTests(DevtoolBase): | |||
435 | checkvars['SRC_URI'] = url | 429 | checkvars['SRC_URI'] = url |
436 | self._test_recipe_contents(recipefile, checkvars, []) | 430 | self._test_recipe_contents(recipefile, checkvars, []) |
437 | 431 | ||
438 | @OETestID(1161) | ||
439 | def test_devtool_add_fetch_git(self): | 432 | def test_devtool_add_fetch_git(self): |
440 | tempdir = tempfile.mkdtemp(prefix='devtoolqa') | 433 | tempdir = tempfile.mkdtemp(prefix='devtoolqa') |
441 | self.track_for_cleanup(tempdir) | 434 | self.track_for_cleanup(tempdir) |
@@ -483,7 +476,6 @@ class DevtoolAddTests(DevtoolBase): | |||
483 | checkvars['SRCREV'] = checkrev | 476 | checkvars['SRCREV'] = checkrev |
484 | self._test_recipe_contents(recipefile, checkvars, []) | 477 | self._test_recipe_contents(recipefile, checkvars, []) |
485 | 478 | ||
486 | @OETestID(1391) | ||
487 | def test_devtool_add_fetch_simple(self): | 479 | def test_devtool_add_fetch_simple(self): |
488 | # Fetch source from a remote URL, auto-detecting name | 480 | # Fetch source from a remote URL, auto-detecting name |
489 | tempdir = tempfile.mkdtemp(prefix='devtoolqa') | 481 | tempdir = tempfile.mkdtemp(prefix='devtoolqa') |
@@ -513,7 +505,6 @@ class DevtoolAddTests(DevtoolBase): | |||
513 | 505 | ||
514 | class DevtoolModifyTests(DevtoolBase): | 506 | class DevtoolModifyTests(DevtoolBase): |
515 | 507 | ||
516 | @OETestID(1164) | ||
517 | def test_devtool_modify(self): | 508 | def test_devtool_modify(self): |
518 | import oe.path | 509 | import oe.path |
519 | 510 | ||
@@ -571,7 +562,6 @@ class DevtoolModifyTests(DevtoolBase): | |||
571 | result = runCmd('devtool status') | 562 | result = runCmd('devtool status') |
572 | self.assertNotIn('mdadm', result.output) | 563 | self.assertNotIn('mdadm', result.output) |
573 | 564 | ||
574 | @OETestID(1620) | ||
575 | def test_devtool_buildclean(self): | 565 | def test_devtool_buildclean(self): |
576 | def assertFile(path, *paths): | 566 | def assertFile(path, *paths): |
577 | f = os.path.join(path, *paths) | 567 | f = os.path.join(path, *paths) |
@@ -618,7 +608,6 @@ class DevtoolModifyTests(DevtoolBase): | |||
618 | finally: | 608 | finally: |
619 | self.delete_recipeinc('m4') | 609 | self.delete_recipeinc('m4') |
620 | 610 | ||
621 | @OETestID(1166) | ||
622 | def test_devtool_modify_invalid(self): | 611 | def test_devtool_modify_invalid(self): |
623 | # Try modifying some recipes | 612 | # Try modifying some recipes |
624 | tempdir = tempfile.mkdtemp(prefix='devtoolqa') | 613 | tempdir = tempfile.mkdtemp(prefix='devtoolqa') |
@@ -647,7 +636,6 @@ class DevtoolModifyTests(DevtoolBase): | |||
647 | self.assertNotEqual(result.status, 0, 'devtool modify on %s should have failed. devtool output: %s' % (testrecipe, result.output)) | 636 | self.assertNotEqual(result.status, 0, 'devtool modify on %s should have failed. devtool output: %s' % (testrecipe, result.output)) |
648 | self.assertIn('ERROR: ', result.output, 'devtool modify on %s should have given an ERROR' % testrecipe) | 637 | self.assertIn('ERROR: ', result.output, 'devtool modify on %s should have given an ERROR' % testrecipe) |
649 | 638 | ||
650 | @OETestID(1365) | ||
651 | def test_devtool_modify_native(self): | 639 | def test_devtool_modify_native(self): |
652 | # Check preconditions | 640 | # Check preconditions |
653 | self.assertTrue(not os.path.exists(self.workspacedir), 'This test cannot be run with a workspace directory under the build directory') | 641 | self.assertTrue(not os.path.exists(self.workspacedir), 'This test cannot be run with a workspace directory under the build directory') |
@@ -677,7 +665,6 @@ class DevtoolModifyTests(DevtoolBase): | |||
677 | self.assertTrue(inheritnative, 'None of these recipes do "inherit native" - need to adjust testrecipes list: %s' % ', '.join(testrecipes)) | 665 | self.assertTrue(inheritnative, 'None of these recipes do "inherit native" - need to adjust testrecipes list: %s' % ', '.join(testrecipes)) |
678 | 666 | ||
679 | 667 | ||
680 | @OETestID(1165) | ||
681 | def test_devtool_modify_git(self): | 668 | def test_devtool_modify_git(self): |
682 | # Check preconditions | 669 | # Check preconditions |
683 | testrecipe = 'psplash' | 670 | testrecipe = 'psplash' |
@@ -705,7 +692,6 @@ class DevtoolModifyTests(DevtoolBase): | |||
705 | # Try building | 692 | # Try building |
706 | bitbake(testrecipe) | 693 | bitbake(testrecipe) |
707 | 694 | ||
708 | @OETestID(1167) | ||
709 | def test_devtool_modify_localfiles(self): | 695 | def test_devtool_modify_localfiles(self): |
710 | # Check preconditions | 696 | # Check preconditions |
711 | testrecipe = 'lighttpd' | 697 | testrecipe = 'lighttpd' |
@@ -736,7 +722,6 @@ class DevtoolModifyTests(DevtoolBase): | |||
736 | # Try building | 722 | # Try building |
737 | bitbake(testrecipe) | 723 | bitbake(testrecipe) |
738 | 724 | ||
739 | @OETestID(1378) | ||
740 | def test_devtool_modify_virtual(self): | 725 | def test_devtool_modify_virtual(self): |
741 | # Try modifying a virtual recipe | 726 | # Try modifying a virtual recipe |
742 | virtrecipe = 'virtual/make' | 727 | virtrecipe = 'virtual/make' |
@@ -760,7 +745,6 @@ class DevtoolModifyTests(DevtoolBase): | |||
760 | 745 | ||
761 | class DevtoolUpdateTests(DevtoolBase): | 746 | class DevtoolUpdateTests(DevtoolBase): |
762 | 747 | ||
763 | @OETestID(1169) | ||
764 | def test_devtool_update_recipe(self): | 748 | def test_devtool_update_recipe(self): |
765 | # Check preconditions | 749 | # Check preconditions |
766 | testrecipe = 'minicom' | 750 | testrecipe = 'minicom' |
@@ -793,7 +777,6 @@ class DevtoolUpdateTests(DevtoolBase): | |||
793 | ('??', '.*/0002-Add-a-new-file.patch$')] | 777 | ('??', '.*/0002-Add-a-new-file.patch$')] |
794 | self._check_repo_status(os.path.dirname(recipefile), expected_status) | 778 | self._check_repo_status(os.path.dirname(recipefile), expected_status) |
795 | 779 | ||
796 | @OETestID(1172) | ||
797 | def test_devtool_update_recipe_git(self): | 780 | def test_devtool_update_recipe_git(self): |
798 | # Check preconditions | 781 | # Check preconditions |
799 | testrecipe = 'mtd-utils' | 782 | testrecipe = 'mtd-utils' |
@@ -863,7 +846,6 @@ class DevtoolUpdateTests(DevtoolBase): | |||
863 | ('??', '%s/0002-Add-a-new-file.patch' % relpatchpath)] | 846 | ('??', '%s/0002-Add-a-new-file.patch' % relpatchpath)] |
864 | self._check_repo_status(os.path.dirname(recipefile), expected_status) | 847 | self._check_repo_status(os.path.dirname(recipefile), expected_status) |
865 | 848 | ||
866 | @OETestID(1170) | ||
867 | def test_devtool_update_recipe_append(self): | 849 | def test_devtool_update_recipe_append(self): |
868 | # Check preconditions | 850 | # Check preconditions |
869 | testrecipe = 'mdadm' | 851 | testrecipe = 'mdadm' |
@@ -932,7 +914,6 @@ class DevtoolUpdateTests(DevtoolBase): | |||
932 | self.assertEqual(expectedlines, f.readlines()) | 914 | self.assertEqual(expectedlines, f.readlines()) |
933 | # Deleting isn't expected to work under these circumstances | 915 | # Deleting isn't expected to work under these circumstances |
934 | 916 | ||
935 | @OETestID(1171) | ||
936 | def test_devtool_update_recipe_append_git(self): | 917 | def test_devtool_update_recipe_append_git(self): |
937 | # Check preconditions | 918 | # Check preconditions |
938 | testrecipe = 'mtd-utils' | 919 | testrecipe = 'mtd-utils' |
@@ -1023,7 +1004,6 @@ class DevtoolUpdateTests(DevtoolBase): | |||
1023 | self.assertEqual(expectedlines, set(f.readlines())) | 1004 | self.assertEqual(expectedlines, set(f.readlines())) |
1024 | # Deleting isn't expected to work under these circumstances | 1005 | # Deleting isn't expected to work under these circumstances |
1025 | 1006 | ||
1026 | @OETestID(1370) | ||
1027 | def test_devtool_update_recipe_local_files(self): | 1007 | def test_devtool_update_recipe_local_files(self): |
1028 | """Check that local source files are copied over instead of patched""" | 1008 | """Check that local source files are copied over instead of patched""" |
1029 | testrecipe = 'makedevs' | 1009 | testrecipe = 'makedevs' |
@@ -1055,7 +1035,6 @@ class DevtoolUpdateTests(DevtoolBase): | |||
1055 | ('??', '.*/makedevs/0001-Add-new-file.patch$')] | 1035 | ('??', '.*/makedevs/0001-Add-new-file.patch$')] |
1056 | self._check_repo_status(os.path.dirname(recipefile), expected_status) | 1036 | self._check_repo_status(os.path.dirname(recipefile), expected_status) |
1057 | 1037 | ||
1058 | @OETestID(1371) | ||
1059 | def test_devtool_update_recipe_local_files_2(self): | 1038 | def test_devtool_update_recipe_local_files_2(self): |
1060 | """Check local source files support when oe-local-files is in Git""" | 1039 | """Check local source files support when oe-local-files is in Git""" |
1061 | testrecipe = 'devtool-test-local' | 1040 | testrecipe = 'devtool-test-local' |
@@ -1100,7 +1079,6 @@ class DevtoolUpdateTests(DevtoolBase): | |||
1100 | ('??', '.*/0001-Add-new-file.patch$')] | 1079 | ('??', '.*/0001-Add-new-file.patch$')] |
1101 | self._check_repo_status(os.path.dirname(recipefile), expected_status) | 1080 | self._check_repo_status(os.path.dirname(recipefile), expected_status) |
1102 | 1081 | ||
1103 | @OETestID(1627) | ||
1104 | def test_devtool_update_recipe_local_files_3(self): | 1082 | def test_devtool_update_recipe_local_files_3(self): |
1105 | # First, modify the recipe | 1083 | # First, modify the recipe |
1106 | testrecipe = 'devtool-test-localonly' | 1084 | testrecipe = 'devtool-test-localonly' |
@@ -1120,7 +1098,6 @@ class DevtoolUpdateTests(DevtoolBase): | |||
1120 | expected_status = [(' M', '.*/%s/file2$' % testrecipe)] | 1098 | expected_status = [(' M', '.*/%s/file2$' % testrecipe)] |
1121 | self._check_repo_status(os.path.dirname(recipefile), expected_status) | 1099 | self._check_repo_status(os.path.dirname(recipefile), expected_status) |
1122 | 1100 | ||
1123 | @OETestID(1629) | ||
1124 | def test_devtool_update_recipe_local_patch_gz(self): | 1101 | def test_devtool_update_recipe_local_patch_gz(self): |
1125 | # First, modify the recipe | 1102 | # First, modify the recipe |
1126 | testrecipe = 'devtool-test-patch-gz' | 1103 | testrecipe = 'devtool-test-patch-gz' |
@@ -1148,7 +1125,6 @@ class DevtoolUpdateTests(DevtoolBase): | |||
1148 | if 'gzip compressed data' not in result.output: | 1125 | if 'gzip compressed data' not in result.output: |
1149 | self.fail('New patch file is not gzipped - file reports:\n%s' % result.output) | 1126 | self.fail('New patch file is not gzipped - file reports:\n%s' % result.output) |
1150 | 1127 | ||
1151 | @OETestID(1628) | ||
1152 | def test_devtool_update_recipe_local_files_subdir(self): | 1128 | def test_devtool_update_recipe_local_files_subdir(self): |
1153 | # Try devtool update-recipe on a recipe that has a file with subdir= set in | 1129 | # Try devtool update-recipe on a recipe that has a file with subdir= set in |
1154 | # SRC_URI such that it overwrites a file that was in an archive that | 1130 | # SRC_URI such that it overwrites a file that was in an archive that |
@@ -1177,7 +1153,6 @@ class DevtoolUpdateTests(DevtoolBase): | |||
1177 | 1153 | ||
1178 | class DevtoolExtractTests(DevtoolBase): | 1154 | class DevtoolExtractTests(DevtoolBase): |
1179 | 1155 | ||
1180 | @OETestID(1163) | ||
1181 | def test_devtool_extract(self): | 1156 | def test_devtool_extract(self): |
1182 | tempdir = tempfile.mkdtemp(prefix='devtoolqa') | 1157 | tempdir = tempfile.mkdtemp(prefix='devtoolqa') |
1183 | # Try devtool extract | 1158 | # Try devtool extract |
@@ -1188,7 +1163,6 @@ class DevtoolExtractTests(DevtoolBase): | |||
1188 | self.assertExists(os.path.join(tempdir, 'Makefile.am'), 'Extracted source could not be found') | 1163 | self.assertExists(os.path.join(tempdir, 'Makefile.am'), 'Extracted source could not be found') |
1189 | self._check_src_repo(tempdir) | 1164 | self._check_src_repo(tempdir) |
1190 | 1165 | ||
1191 | @OETestID(1379) | ||
1192 | def test_devtool_extract_virtual(self): | 1166 | def test_devtool_extract_virtual(self): |
1193 | tempdir = tempfile.mkdtemp(prefix='devtoolqa') | 1167 | tempdir = tempfile.mkdtemp(prefix='devtoolqa') |
1194 | # Try devtool extract | 1168 | # Try devtool extract |
@@ -1199,7 +1173,6 @@ class DevtoolExtractTests(DevtoolBase): | |||
1199 | self.assertExists(os.path.join(tempdir, 'Makefile.am'), 'Extracted source could not be found') | 1173 | self.assertExists(os.path.join(tempdir, 'Makefile.am'), 'Extracted source could not be found') |
1200 | self._check_src_repo(tempdir) | 1174 | self._check_src_repo(tempdir) |
1201 | 1175 | ||
1202 | @OETestID(1168) | ||
1203 | def test_devtool_reset_all(self): | 1176 | def test_devtool_reset_all(self): |
1204 | tempdir = tempfile.mkdtemp(prefix='devtoolqa') | 1177 | tempdir = tempfile.mkdtemp(prefix='devtoolqa') |
1205 | self.track_for_cleanup(tempdir) | 1178 | self.track_for_cleanup(tempdir) |
@@ -1226,7 +1199,6 @@ class DevtoolExtractTests(DevtoolBase): | |||
1226 | matches2 = glob.glob(stampprefix2 + '*') | 1199 | matches2 = glob.glob(stampprefix2 + '*') |
1227 | self.assertFalse(matches2, 'Stamp files exist for recipe %s that should have been cleaned' % testrecipe2) | 1200 | self.assertFalse(matches2, 'Stamp files exist for recipe %s that should have been cleaned' % testrecipe2) |
1228 | 1201 | ||
1229 | @OETestID(1272) | ||
1230 | def test_devtool_deploy_target(self): | 1202 | def test_devtool_deploy_target(self): |
1231 | # NOTE: Whilst this test would seemingly be better placed as a runtime test, | 1203 | # NOTE: Whilst this test would seemingly be better placed as a runtime test, |
1232 | # unfortunately the runtime tests run under bitbake and you can't run | 1204 | # unfortunately the runtime tests run under bitbake and you can't run |
@@ -1312,7 +1284,6 @@ class DevtoolExtractTests(DevtoolBase): | |||
1312 | result = runCmd('ssh %s root@%s %s' % (sshargs, qemu.ip, testcommand), ignore_status=True) | 1284 | result = runCmd('ssh %s root@%s %s' % (sshargs, qemu.ip, testcommand), ignore_status=True) |
1313 | self.assertNotEqual(result, 0, 'undeploy-target did not remove command as it should have') | 1285 | self.assertNotEqual(result, 0, 'undeploy-target did not remove command as it should have') |
1314 | 1286 | ||
1315 | @OETestID(1366) | ||
1316 | def test_devtool_build_image(self): | 1287 | def test_devtool_build_image(self): |
1317 | """Test devtool build-image plugin""" | 1288 | """Test devtool build-image plugin""" |
1318 | # Check preconditions | 1289 | # Check preconditions |
@@ -1348,7 +1319,6 @@ class DevtoolExtractTests(DevtoolBase): | |||
1348 | 1319 | ||
1349 | class DevtoolUpgradeTests(DevtoolBase): | 1320 | class DevtoolUpgradeTests(DevtoolBase): |
1350 | 1321 | ||
1351 | @OETestID(1367) | ||
1352 | def test_devtool_upgrade(self): | 1322 | def test_devtool_upgrade(self): |
1353 | # Check preconditions | 1323 | # Check preconditions |
1354 | self.assertTrue(not os.path.exists(self.workspacedir), 'This test cannot be run with a workspace directory under the build directory') | 1324 | self.assertTrue(not os.path.exists(self.workspacedir), 'This test cannot be run with a workspace directory under the build directory') |
@@ -1393,7 +1363,6 @@ class DevtoolUpgradeTests(DevtoolBase): | |||
1393 | self.assertNotIn(recipe, result.output) | 1363 | self.assertNotIn(recipe, result.output) |
1394 | self.assertNotExists(os.path.join(self.workspacedir, 'recipes', recipe), 'Recipe directory should not exist after resetting') | 1364 | self.assertNotExists(os.path.join(self.workspacedir, 'recipes', recipe), 'Recipe directory should not exist after resetting') |
1395 | 1365 | ||
1396 | @OETestID(1433) | ||
1397 | def test_devtool_upgrade_git(self): | 1366 | def test_devtool_upgrade_git(self): |
1398 | # Check preconditions | 1367 | # Check preconditions |
1399 | self.assertTrue(not os.path.exists(self.workspacedir), 'This test cannot be run with a workspace directory under the build directory') | 1368 | self.assertTrue(not os.path.exists(self.workspacedir), 'This test cannot be run with a workspace directory under the build directory') |
@@ -1430,7 +1399,6 @@ class DevtoolUpgradeTests(DevtoolBase): | |||
1430 | self.assertNotIn(recipe, result.output) | 1399 | self.assertNotIn(recipe, result.output) |
1431 | self.assertNotExists(os.path.join(self.workspacedir, 'recipes', recipe), 'Recipe directory should not exist after resetting') | 1400 | self.assertNotExists(os.path.join(self.workspacedir, 'recipes', recipe), 'Recipe directory should not exist after resetting') |
1432 | 1401 | ||
1433 | @OETestID(1352) | ||
1434 | def test_devtool_layer_plugins(self): | 1402 | def test_devtool_layer_plugins(self): |
1435 | """Test that devtool can use plugins from other layers. | 1403 | """Test that devtool can use plugins from other layers. |
1436 | 1404 | ||
@@ -1456,7 +1424,6 @@ class DevtoolUpgradeTests(DevtoolBase): | |||
1456 | shutil.copy(srcfile, dstfile) | 1424 | shutil.copy(srcfile, dstfile) |
1457 | self.track_for_cleanup(dstfile) | 1425 | self.track_for_cleanup(dstfile) |
1458 | 1426 | ||
1459 | @OETestID(1625) | ||
1460 | def test_devtool_load_plugin(self): | 1427 | def test_devtool_load_plugin(self): |
1461 | """Test that devtool loads only the first found plugin in BBPATH.""" | 1428 | """Test that devtool loads only the first found plugin in BBPATH.""" |
1462 | 1429 | ||
@@ -1524,7 +1491,6 @@ class DevtoolUpgradeTests(DevtoolBase): | |||
1524 | self.assertExists(os.path.join(olddir, patchfn), 'Original patch file does not exist') | 1491 | self.assertExists(os.path.join(olddir, patchfn), 'Original patch file does not exist') |
1525 | return recipe, oldrecipefile, recipedir, olddir, newversion, patchfn | 1492 | return recipe, oldrecipefile, recipedir, olddir, newversion, patchfn |
1526 | 1493 | ||
1527 | @OETestID(1623) | ||
1528 | def test_devtool_finish_upgrade_origlayer(self): | 1494 | def test_devtool_finish_upgrade_origlayer(self): |
1529 | recipe, oldrecipefile, recipedir, olddir, newversion, patchfn = self._setup_test_devtool_finish_upgrade() | 1495 | recipe, oldrecipefile, recipedir, olddir, newversion, patchfn = self._setup_test_devtool_finish_upgrade() |
1530 | # Ensure the recipe is where we think it should be (so that cleanup doesn't trash things) | 1496 | # Ensure the recipe is where we think it should be (so that cleanup doesn't trash things) |
@@ -1543,7 +1509,6 @@ class DevtoolUpgradeTests(DevtoolBase): | |||
1543 | self.assertExists(os.path.join(newdir, patchfn), 'Patch file should have been copied into new directory but wasn\'t') | 1509 | self.assertExists(os.path.join(newdir, patchfn), 'Patch file should have been copied into new directory but wasn\'t') |
1544 | self.assertExists(os.path.join(newdir, '0002-Add-a-comment-to-the-code.patch'), 'New patch file should have been created but wasn\'t') | 1510 | self.assertExists(os.path.join(newdir, '0002-Add-a-comment-to-the-code.patch'), 'New patch file should have been created but wasn\'t') |
1545 | 1511 | ||
1546 | @OETestID(1624) | ||
1547 | def test_devtool_finish_upgrade_otherlayer(self): | 1512 | def test_devtool_finish_upgrade_otherlayer(self): |
1548 | recipe, oldrecipefile, recipedir, olddir, newversion, patchfn = self._setup_test_devtool_finish_upgrade() | 1513 | recipe, oldrecipefile, recipedir, olddir, newversion, patchfn = self._setup_test_devtool_finish_upgrade() |
1549 | # Ensure the recipe is where we think it should be (so that cleanup doesn't trash things) | 1514 | # Ensure the recipe is where we think it should be (so that cleanup doesn't trash things) |
@@ -1599,7 +1564,6 @@ class DevtoolUpgradeTests(DevtoolBase): | |||
1599 | self.fail('Unable to find recipe files directory for %s' % recipe) | 1564 | self.fail('Unable to find recipe files directory for %s' % recipe) |
1600 | return recipe, oldrecipefile, recipedir, filesdir | 1565 | return recipe, oldrecipefile, recipedir, filesdir |
1601 | 1566 | ||
1602 | @OETestID(1621) | ||
1603 | def test_devtool_finish_modify_origlayer(self): | 1567 | def test_devtool_finish_modify_origlayer(self): |
1604 | recipe, oldrecipefile, recipedir, filesdir = self._setup_test_devtool_finish_modify() | 1568 | recipe, oldrecipefile, recipedir, filesdir = self._setup_test_devtool_finish_modify() |
1605 | # Ensure the recipe is where we think it should be (so that cleanup doesn't trash things) | 1569 | # Ensure the recipe is where we think it should be (so that cleanup doesn't trash things) |
@@ -1614,7 +1578,6 @@ class DevtoolUpgradeTests(DevtoolBase): | |||
1614 | ('??', '.*/.*-Add-a-comment-to-the-code.patch$')] | 1578 | ('??', '.*/.*-Add-a-comment-to-the-code.patch$')] |
1615 | self._check_repo_status(recipedir, expected_status) | 1579 | self._check_repo_status(recipedir, expected_status) |
1616 | 1580 | ||
1617 | @OETestID(1622) | ||
1618 | def test_devtool_finish_modify_otherlayer(self): | 1581 | def test_devtool_finish_modify_otherlayer(self): |
1619 | recipe, oldrecipefile, recipedir, filesdir = self._setup_test_devtool_finish_modify() | 1582 | recipe, oldrecipefile, recipedir, filesdir = self._setup_test_devtool_finish_modify() |
1620 | # Ensure the recipe is where we think it should be (so that cleanup doesn't trash things) | 1583 | # Ensure the recipe is where we think it should be (so that cleanup doesn't trash things) |
@@ -1647,7 +1610,6 @@ class DevtoolUpgradeTests(DevtoolBase): | |||
1647 | if files: | 1610 | if files: |
1648 | self.fail('Unexpected file(s) copied next to bbappend: %s' % ', '.join(files)) | 1611 | self.fail('Unexpected file(s) copied next to bbappend: %s' % ', '.join(files)) |
1649 | 1612 | ||
1650 | @OETestID(1626) | ||
1651 | def test_devtool_rename(self): | 1613 | def test_devtool_rename(self): |
1652 | # Check preconditions | 1614 | # Check preconditions |
1653 | self.assertTrue(not os.path.exists(self.workspacedir), 'This test cannot be run with a workspace directory under the build directory') | 1615 | self.assertTrue(not os.path.exists(self.workspacedir), 'This test cannot be run with a workspace directory under the build directory') |
@@ -1708,7 +1670,6 @@ class DevtoolUpgradeTests(DevtoolBase): | |||
1708 | checkvars['SRC_URI'] = url | 1670 | checkvars['SRC_URI'] = url |
1709 | self._test_recipe_contents(newrecipefile, checkvars, []) | 1671 | self._test_recipe_contents(newrecipefile, checkvars, []) |
1710 | 1672 | ||
1711 | @OETestID(1577) | ||
1712 | def test_devtool_virtual_kernel_modify(self): | 1673 | def test_devtool_virtual_kernel_modify(self): |
1713 | """ | 1674 | """ |
1714 | Summary: The purpose of this test case is to verify that | 1675 | Summary: The purpose of this test case is to verify that |