diff options
Diffstat (limited to 'meta/lib')
| -rw-r--r-- | meta/lib/oeqa/selftest/cases/fetch.py | 2 | ||||
| -rw-r--r-- | meta/lib/oeqa/selftest/cases/recipetool.py | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/meta/lib/oeqa/selftest/cases/fetch.py b/meta/lib/oeqa/selftest/cases/fetch.py index 3d01cf69f2..c9107022c8 100644 --- a/meta/lib/oeqa/selftest/cases/fetch.py +++ b/meta/lib/oeqa/selftest/cases/fetch.py | |||
| @@ -36,6 +36,7 @@ PREMIRRORS:forcevariable = "" | |||
| 36 | # No mirrors and broken git, should fail | 36 | # No mirrors and broken git, should fail |
| 37 | features = """ | 37 | features = """ |
| 38 | DL_DIR = "%s" | 38 | DL_DIR = "%s" |
| 39 | SRC_URI:pn-dbus-wait = "git://git.yoctoproject.org/dbus-wait;branch=master;protocol=git" | ||
| 39 | GIT_PROXY_COMMAND = "false" | 40 | GIT_PROXY_COMMAND = "false" |
| 40 | MIRRORS:forcevariable = "" | 41 | MIRRORS:forcevariable = "" |
| 41 | PREMIRRORS:forcevariable = "" | 42 | PREMIRRORS:forcevariable = "" |
| @@ -48,6 +49,7 @@ PREMIRRORS:forcevariable = "" | |||
| 48 | # Broken git but a specific mirror | 49 | # Broken git but a specific mirror |
| 49 | features = """ | 50 | features = """ |
| 50 | DL_DIR = "%s" | 51 | DL_DIR = "%s" |
| 52 | SRC_URI:pn-dbus-wait = "git://git.yoctoproject.org/dbus-wait;branch=master;protocol=git" | ||
| 51 | GIT_PROXY_COMMAND = "false" | 53 | GIT_PROXY_COMMAND = "false" |
| 52 | MIRRORS:forcevariable = "git://.*/.* http://downloads.yoctoproject.org/mirror/sources/" | 54 | MIRRORS:forcevariable = "git://.*/.* http://downloads.yoctoproject.org/mirror/sources/" |
| 53 | """ % dldir | 55 | """ % dldir |
diff --git a/meta/lib/oeqa/selftest/cases/recipetool.py b/meta/lib/oeqa/selftest/cases/recipetool.py index b193f0f5c8..a5c0f7164a 100644 --- a/meta/lib/oeqa/selftest/cases/recipetool.py +++ b/meta/lib/oeqa/selftest/cases/recipetool.py | |||
| @@ -361,7 +361,7 @@ class RecipetoolCreateTests(RecipetoolBase): | |||
| 361 | tempsrc = os.path.join(self.tempdir, 'srctree') | 361 | tempsrc = os.path.join(self.tempdir, 'srctree') |
| 362 | os.makedirs(tempsrc) | 362 | os.makedirs(tempsrc) |
| 363 | recipefile = os.path.join(self.tempdir, 'libmatchbox.bb') | 363 | recipefile = os.path.join(self.tempdir, 'libmatchbox.bb') |
| 364 | srcuri = 'git://git.yoctoproject.org/libmatchbox' | 364 | srcuri = 'git://git.yoctoproject.org/libmatchbox;protocol=https' |
| 365 | result = runCmd(['recipetool', 'create', '-o', recipefile, srcuri + ";rev=9f7cf8895ae2d39c465c04cc78e918c157420269", '-x', tempsrc]) | 365 | result = runCmd(['recipetool', 'create', '-o', recipefile, srcuri + ";rev=9f7cf8895ae2d39c465c04cc78e918c157420269", '-x', tempsrc]) |
| 366 | self.assertTrue(os.path.isfile(recipefile), 'recipetool did not create recipe file; output:\n%s' % result.output) | 366 | self.assertTrue(os.path.isfile(recipefile), 'recipetool did not create recipe file; output:\n%s' % result.output) |
| 367 | checkvars = {} | 367 | checkvars = {} |
| @@ -511,13 +511,13 @@ class RecipetoolCreateTests(RecipetoolBase): | |||
| 511 | self._test_recipetool_create_git('http://git.yoctoproject.org/git/matchbox-keyboard') | 511 | self._test_recipetool_create_git('http://git.yoctoproject.org/git/matchbox-keyboard') |
| 512 | 512 | ||
| 513 | def test_recipetool_create_git_srcuri_master(self): | 513 | def test_recipetool_create_git_srcuri_master(self): |
| 514 | self._test_recipetool_create_git('git://git.yoctoproject.org/matchbox-keyboard;branch=master') | 514 | self._test_recipetool_create_git('git://git.yoctoproject.org/matchbox-keyboard;branch=master;protocol=https') |
| 515 | 515 | ||
| 516 | def test_recipetool_create_git_srcuri_branch(self): | 516 | def test_recipetool_create_git_srcuri_branch(self): |
| 517 | self._test_recipetool_create_git('git://git.yoctoproject.org/matchbox-keyboard;branch=matchbox-keyboard-0-1') | 517 | self._test_recipetool_create_git('git://git.yoctoproject.org/matchbox-keyboard;branch=matchbox-keyboard-0-1;protocol=https') |
| 518 | 518 | ||
| 519 | def test_recipetool_create_git_srcbranch(self): | 519 | def test_recipetool_create_git_srcbranch(self): |
| 520 | self._test_recipetool_create_git('git://git.yoctoproject.org/matchbox-keyboard', 'matchbox-keyboard-0-1') | 520 | self._test_recipetool_create_git('git://git.yoctoproject.org/matchbox-keyboard;protocol=https', 'matchbox-keyboard-0-1') |
| 521 | 521 | ||
| 522 | 522 | ||
| 523 | class RecipetoolTests(RecipetoolBase): | 523 | class RecipetoolTests(RecipetoolBase): |
