Ubuntu
ensemble package

Merge lp:~ubuntu-branches/ubuntu/oneiric/ensemble/oneiric-201109062006 into lp:ubuntu/oneiric/ensemble

  1. Oneiric (11.10)
  2. oneiric-201109062006
  3. Merge into oneiric
Proposed by Ubuntu Package Importer
Status: Needs review
Proposed branch: lp:~ubuntu-branches/ubuntu/oneiric/ensemble/oneiric-201109062006
Merge into: lp:ubuntu/oneiric/ensemble
Diff against target: 113 lines (+89/-0) (has conflicts)
4 files modified
debian/patches/fix-failing-bundle-test.patch (+24/-0)
debian/patches/fix-tests-with-no-ssh-key.patch (+43/-0)
debian/patches/fix-tests-without-aws-key.patch (+19/-0)
debian/patches/series (+3/-0)
Conflict adding file debian/patches.  Moved existing file to debian/patches.moved.
To merge this branch: bzr merge lp:~ubuntu-branches/ubuntu/oneiric/ensemble/oneiric-201109062006
Reviewer Review Type Date Requested Status
Ubuntu Development Team Pending
Review via email: mp+74299@code.launchpad.net

Description of the change

The package importer has detected a possible inconsistency between the package history in the archve and the history in bzr. As the archive is authoritative the importer has made lp:ubuntu/oneiric/ensemble reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/oneiric/ensemble/oneiric-201109062006. This merge proposal was created so that an Ubuntu developer can review the situations and perform a merge/upload if necessary. There are three typical cases where this can happen.
  1. Where someone pushes a change to bzr and someone else uploads the package without that change. This is the reason that this check is done by the importer. If this appears to be the case then a merge/upload should be done if the changes that were in bzr are still desirable.
  2. The importer incorrectly detected the above situation when someone made a change in bzr and then uploaded it.
  3. The importer incorrectly detected the above situation when someone just uploaded a package and didn't touch bzr.

If this case doesn't appear to be the first situation then set the status of the merge proposal to "Rejected" and help avoid the problem in future by filing a bug at https://bugs.launchpad.net/udd linking to this merge proposal.

(this is an automatically generated message)

To post a comment you must log in.

Unmerged revisions

19. By Clint Byrum

removing enable debug patch as it breaks the test suite

18. By Clint Byrum

releasing version 0.5+bzr336-0ubuntu1

17. By Clint Byrum

* d/patches/fix-*: Patches to fix failing tests.
* d/patches/enable-cloud-init-debug.patch: make cloud-init debugging
  easier on ensemble managed machines. (LP: #842488)

16. By Clint Byrum

  (LP: #801020)

15. By Clint Byrum

d/control: Depend on openssh-client. (LP: #835154)

14. By Clint Byrum

lintian warning about dh overrides

13. By Clint Byrum

* d/patches/*: Patches to fix failing tests.
* d/rules: fail to build if tests fail. Remove test-results.txt
  from package (not as interesting now that they MUST pass).

12. By Clint Byrum

New upstream snapshot.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory 'debian/patches'
2=== renamed directory 'debian/patches' => 'debian/patches.moved'
3=== added file 'debian/patches/fix-failing-bundle-test.patch'
4--- debian/patches/fix-failing-bundle-test.patch 1970-01-01 00:00:00 +0000
5+++ debian/patches/fix-failing-bundle-test.patch 2011-09-06 20:10:56 +0000
6@@ -0,0 +1,24 @@
7+Author: Clint Byrum <clint@ubuntu.com>
8+Origin: http://bazaar.launchpad.net/~clint-fewbar/ensemble/fix-failing-bundle-test/revision/337
9+Bug: http://pad.lv/839695
10+Description: test assumed umask of 0022, but umask has been changed to 0002. Just test for executable, which is the necessary portion.
11+Forwarded: yes
12+
13+=== modified file 'ensemble/formula/tests/test_bundle.py'
14+--- a/ensemble/formula/tests/test_bundle.py 2011-08-26 13:01:46 +0000
15++++ b/ensemble/formula/tests/test_bundle.py 2011-09-02 16:41:55 +0000
16+@@ -83,10 +83,12 @@
17+ def test_executable_extraction(self):
18+ sample_directory = os.path.join(repository_directory, "varnish2")
19+ formula_directory = FormulaDirectory(sample_directory)
20++ source_hook_path = os.path.join(sample_directory, "hooks", "install")
21++ self.assertTrue(os.access(source_hook_path, os.X_OK))
22+ bundle = formula_directory.as_bundle()
23+ directory = bundle.as_directory()
24+ hook_path = os.path.join(directory.path, "hooks", "install")
25+- self.assertEqual(stat.S_IMODE(os.stat(hook_path)[0]), 493)
26++ self.assertTrue(os.access(hook_path, os.X_OK))
27+
28+ def get_formula_sha256(self):
29+ return compute_file_hash(hashlib.sha256, self.filename)
30+
31
32=== added file 'debian/patches/fix-tests-with-no-ssh-key.patch'
33--- debian/patches/fix-tests-with-no-ssh-key.patch 1970-01-01 00:00:00 +0000
34+++ debian/patches/fix-tests-with-no-ssh-key.patch 2011-09-06 20:10:56 +0000
35@@ -0,0 +1,43 @@
36+Author: Clint Byrum <clint@ubuntu.com>
37+Origin: http://bazaar.launchpad.net/~clint-fewbar/ensemble/fix-tests-with-no-ssh-key/revision/337
38+Bug: http://pad.lv/813112
39+Description: Tests failed when the user running them had no ssh key (as in the buildd run during build). This corrects those problems.
40+Forwarded: yes
41+
42+=== modified file 'ensemble/lib/testing.py'
43+--- a/ensemble/lib/testing.py 2011-08-03 06:04:37 +0000
44++++ b/ensemble/lib/testing.py 2011-09-01 20:59:38 +0000
45+@@ -100,6 +100,7 @@
46+ "AWS_SECRET_ACCESS_KEY",
47+ "EC2_PRIVATE_KEY",
48+ "EC2_CERT",
49++ "HOME",
50+ "ZOOKEEPER_ADDRESS"]:
51+ if env not in kw:
52+ kw[env] = os.environ.get(env, "")
53+
54+=== modified file 'ensemble/providers/ec2/tests/test_provider.py'
55+--- a/ensemble/providers/ec2/tests/test_provider.py 2011-08-29 02:23:11 +0000
56++++ b/ensemble/providers/ec2/tests/test_provider.py 2011-09-01 20:59:38 +0000
57+@@ -102,7 +102,8 @@
58+ the environment, when serializing.
59+ """
60+ config = {"access-key": "secret-12345",
61+- "secret-key": "secret-abc"}
62++ "secret-key": "secret-abc",
63++ "authorized-keys": "0123456789abcdef"}
64+
65+ environ = {
66+ "AWS_SECRET_ACCESS_KEY": "secret-abc",
67+@@ -110,9 +111,8 @@
68+
69+ self.change_environment(**environ)
70+ provider = MachineProvider(
71+- self.env_name, {"access-key": "secret-12345"})
72++ self.env_name, config)
73+ serialized = provider.get_serialization_data()
74+- serialized.pop("authorized-keys", None)
75+ self.assertEqual(config, serialized)
76+
77+
78+
79
80=== added file 'debian/patches/fix-tests-without-aws-key.patch'
81--- debian/patches/fix-tests-without-aws-key.patch 1970-01-01 00:00:00 +0000
82+++ debian/patches/fix-tests-without-aws-key.patch 2011-09-06 20:10:56 +0000
83@@ -0,0 +1,19 @@
84+Author: Clint Byrum <clint@ubuntu.com>
85+Origin: http://bazaar.launchpad.net/~clint-fewbar/ensemble/fix-tests-without-aws-access-key-id/revision/337
86+Bug: http://pad.lv/819329
87+Forwarded: yes
88+Subject: tests would not run without these AWS_* vars set.
89+
90+=== modified file 'ensemble/environment/tests/test_config.py'
91+--- a/ensemble/environment/tests/test_config.py 2011-08-09 19:25:58 +0000
92++++ b/ensemble/environment/tests/test_config.py 2011-08-31 23:51:37 +0000
93+@@ -47,7 +47,7 @@
94+ yield super(EnvironmentsConfigTestBase, self).setUp()
95+ self.old_home = os.environ.get("HOME")
96+ self.tmp_home = self.makeDir()
97+- self.change_environment(HOME=self.tmp_home)
98++ self.change_environment(HOME=self.tmp_home, AWS_ACCESS_KEY_ID="foo", AWS_SECRET_ACCESS_KEY="bar")
99+ self.default_path = os.path.join(self.tmp_home,
100+ ".ensemble/environments.yaml")
101+ self.other_path = os.path.join(self.tmp_home,
102+
103
104=== added file 'debian/patches/series'
105--- debian/patches/series 1970-01-01 00:00:00 +0000
106+++ debian/patches/series 2011-09-06 20:10:56 +0000
107@@ -0,0 +1,3 @@
108+fix-failing-bundle-test.patch
109+fix-tests-with-no-ssh-key.patch
110+fix-tests-without-aws-key.patch
111
112=== modified file 'ensemble/formula/tests/test_bundle.py'
113=== modified file 'ensemble/providers/ec2/tests/test_provider.py'

Subscribers

People subscribed via source and target branches

to all changes: