This fixes it, going to upload.
commit cbac10742cc44d66c82ee9776157273a5cce7a59
Author: Martin Pitt <martin.p...@ubuntu.com>
Date: Tue May 31 23:42:47 2016 +0200
Fix ChrootRunner.test_setup_commands_string when ran recursively
Commit a94e5ac42 exported $ADT_NORMAL_USER to tests. So remove it from the
environment for the this test as it otherwise breaks it when we run our own
tests through autopkgtest.
diff --git a/tests/adt-run b/tests/adt-run
index fc7e7c0..1f870a0 100755
--- a/tests/adt-run
+++ b/tests/adt-run
@@ -1638,13 +1638,19 @@ Restrictions: needs-root
p = self.build_src('Tests: pass\nDepends:\nRestrictions: needs-root\n',
{'pass': '#!/bin/sh -e\n[ -x /bin/cp_cp ]; cat
/setup.log\n'})
- # not expecting a normal user for chroot
+ # not expecting a normal user for chroot; but filter out any
+ # $ADT_NORMAL_USER from *our* environment
+ env = os.environ.copy()
+ try:
+ del env['ADT_NORMAL_USER']
+ except KeyError:
+ pass
(code, out, err) = self.runtest(['-B', '--unbuilt-tree=' + p,
'--setup-commands', '[ -z
$ADT_NORMAL_USER ];'
'sleep 3; cp /bin/cp /bin/cp_cp; '
'echo setup_success > /setup.log',
'--setup-commands', 'cp /bin/cp
/bin/cp_cp',
- '--timeout-short=1',
'--timeout-copy=1'])
+ '--timeout-short=1',
'--timeout-copy=1'], env=env)
# test should succeed
self.assertEqual(code, 0, err)
self.assertRegex(out, 'pass\s+PASS', out)
** Also affects: autopkgtest (Ubuntu Xenial)
Importance: Undecided
Status: New
** Changed in: autopkgtest (Ubuntu)
Status: Confirmed => Fix Released
** Changed in: autopkgtest (Ubuntu Xenial)
Status: New => In Progress
** Changed in: autopkgtest (Ubuntu Xenial)
Assignee: (unassigned) => Iain Lane (laney)
** Description changed:
+ [ Description ]
+
+ autopkgtest's own autopkgtests are failing in xenial. The environment
+ now exports $ADT_NORMAL_USER into the tests, and one of the tests checks
+ that this is not set. Commit cbac10742cc44d66c82ee9776157273a5cce7a59
+ cleans it out of the test in question's environment.
+
+ [ Fix ]
+
+ Cherry pick that commit.
+
+ [ QA ]
+
+ This is a testsuite fix. Check that the package builds and that the
+ autopkgtests pass.
+
+ [ Regression potential ]
+
+ It's a test fix only. If it's bad then the test won't be fixed. If the
+ test fix itself is wrong then we could be allowing a regression to pass
+ through. But this fix is in subsequent releases.
+
+ [ Development fix ]
+
+ The commit is in ≥ yakkety.
+
+ [ Original description ]
+
======================================================================
FAIL: test_setup_commands_string (__main__.ChrootRunner)
--setup-commands with command string
----------------------------------------------------------------------
Traceback (most recent call last):
- File "/tmp/autopkgtest.4F1JtS/build.knp/autopkgtest-3.20.4/tests/adt-run",
line 1628, in test_setup_commands_string
- self.assertEqual(code, 0, err)
+ File "/tmp/autopkgtest.4F1JtS/build.knp/autopkgtest-3.20.4/tests/adt-run",
line 1628, in test_setup_commands_string
+ self.assertEqual(code, 0, err)
AssertionError: 16 != 0 : adt-run [12:25:30]: version @version@
adt-run [12:25:30]: host autopkgtest-lxd-muplzd; command line:
/tmp/autopkgtest.4F1JtS/build.knp/autopkgtest-3.20.4/runner/adt-run -B
--unbuilt-tree=/tmp/test.adt-run.4aqx12ew/testpkg --setup-commands '[ -z
$ADT_NORMAL_USER ];sleep 3; cp /bin/cp /bin/cp_cp; echo setup_success >
/setup.log' --setup-commands 'cp /bin/cp /bin/cp_cp' --timeout-short=1
--timeout-copy=1 --- chroot /tmp/test.adt-run.4aqx12ew/chroot
adt-run [12:25:31]: @@@@@@@@@@@@@@@@@@@@ test bed setup
adt-run [12:25:31]: ERROR: testbed failure: testbed setup commands failed
with status 1
-
----------------------------------------------------------------------
Ran 211 tests in 189.417s
FAILED (failures=1, skipped=141)
autopkgtest [13:28:08]: test adt-run: -----------------------]
autopkgtest [13:28:08]: test adt-run: - - - - - - - - - - results - - - - -
- - - - -
adt-run FAIL non-zero exit status 1
autopkgtest [13:28:09]: - - - - - - - - - - running shell - - - - - - - - - -
root@autopkgtest-lxd-muplzd:/tmp/autopkgtest.4F1JtS/build.knp/autopkgtest-3.20.4#
./tests/adt-run ChrootRunner.test_setup_commands_string
test_setup_commands_string (__main__.ChrootRunner)
--setup-commands with command string ... ok
----------------------------------------------------------------------
Ran 1 test in 4.185s
OK
root@autopkgtest-lxd-muplzd:/tmp/autopkgtest.4F1JtS/build.knp/autopkgtest-3.20.4#
-
This is happening on xenial and prevents smooth SRU landings.
--
You received this bug notification because you are a member of Ubuntu
Bugs, which is subscribed to Ubuntu.
https://bugs.launchpad.net/bugs/1686082
Title:
autopkgtest autopkgtest fails on xenial when run under autopkgtest
To manage notifications about this bug go to:
https://bugs.launchpad.net/ubuntu/+source/autopkgtest/+bug/1686082/+subscriptions
--
ubuntu-bugs mailing list
ubuntu-bugs@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
