Merge lp:~matsubara/maas/packaging.precise.sru into lp:~maas-maintainers/maas/packaging.precise.sru

Proposed by Diogo Matsubara on 2013-02-15
Status: Merged
Approved by: Diogo Matsubara on 2013-02-15
Approved revision: 163
Merged at revision: 163
Proposed branch: lp:~matsubara/maas/packaging.precise.sru
Merge into: lp:~maas-maintainers/maas/packaging.precise.sru
Diff against target: 106 lines (+0/-80)
4 files modified
debian/control (+0/-1)
debian/tests/control (+0/-2)
debian/tests/maas-integration.py (+0/-72)
debian/tests/maas-package-test (+0/-5)
To merge this branch: bzr merge lp:~matsubara/maas/packaging.precise.sru
Reviewer Review Type Date Requested Status
Raphaël Badin (community) 2013-02-15 Approve on 2013-02-15
Review via email: mp+148680@code.launchpad.net

Commit message

removes the debian/tests dir and removes the XS-Testsuite header

Description of the change

This branch removes the debian/tests dir as we're maintaining the test in its own branch. Also removes the XS-Testsuite header from the package so the ubuntu qa scripts won't pick it up and automatically create jenkins jobs for the package.

To post a comment you must log in.
Raphaël Badin (rvb) :
review: Approve
Raphaël Badin (rvb) wrote :

IIRC there is no tarmac job for lp:~maas-maintainers/maas/packaging.precise.sru so you need to merge this manually.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2013-02-02 00:25:55 +0000
3+++ debian/control 2013-02-15 12:00:39 +0000
4@@ -10,7 +10,6 @@
5 python-django
6 Standards-Version: 3.9.3
7 X-Python-Version: >= 2.7
8-XS-Testsuite: autopkgtest
9 Homepage: https://launchpad.net/maas
10
11 Package: maas
12
13=== removed directory 'debian/tests'
14=== removed file 'debian/tests/control'
15--- debian/tests/control 2012-09-10 19:28:15 +0000
16+++ debian/tests/control 1970-01-01 00:00:00 +0000
17@@ -1,2 +0,0 @@
18-Tests: maas-package-test
19-Depends: @, python-nose, xvfb, python-pip
20
21=== removed file 'debian/tests/maas-integration.py'
22--- debian/tests/maas-integration.py 2012-09-20 02:22:33 +0000
23+++ debian/tests/maas-integration.py 1970-01-01 00:00:00 +0000
24@@ -1,72 +0,0 @@
25-# TODO
26-# - send ipmi commands to turn on/off nodes
27-# - run import pxe files
28-# - check node states once they're on/off
29-# - check node state changes (declared -> commissionig -> ready)
30-import os
31-from subprocess import check_output
32-import sys
33-from unittest import TestCase
34-
35-from pyvirtualdisplay import Display
36-from sst.actions import (
37- assert_url, assert_text_contains, assert_title_contains, click_button,
38- get_element, go_to, write_textfield)
39-
40-
41-sys.path.insert(0, "/usr/share/maas")
42-os.environ['DJANGO_SETTINGS_MODULE'] = 'maas.settings'
43-from maasserver.models import User
44-
45-MAAS_URL = "http://10.98.0.13/MAAS"
46-ADMIN_USER = "admin"
47-PASSWORD = "test"
48-
49-
50-class TestMAASIntegration(TestCase):
51-
52- def setUp(self):
53- self.display = Display(visible=0, size=(1280, 1024))
54- self.display.start()
55-
56- def tearDown(self):
57- self.display.stop()
58-
59- def createadmin(self):
60- """Run sudo maas createsuperuser."""
61- cmd_output = check_output(
62- ["sudo", "maas", "createsuperuser", "--username=%s" % ADMIN_USER,
63- "--email=example@canonical.com", "--noinput"])
64- ## Set password for admin user.
65- try:
66- admin = User.objects.get(username=ADMIN_USER)
67- except User.DoesNotExist:
68- admin = User(username=ADMIN_USER)
69- admin.set_password(PASSWORD)
70- admin.save()
71- return cmd_output
72-
73- def installation(self):
74- # Check the installation worked.
75- go_to(MAAS_URL)
76- assert_text_contains(
77- get_element(tag="body"), "No admin user has been created yet")
78-
79- def createadmin_and_login(self):
80- ## Creates the admin user.
81- output = self.createadmin()
82- self.assertEqual(output, 'Superuser created successfully.')
83- ## Login with the newly created admin user
84- go_to(MAAS_URL)
85- assert_text_contains(
86- get_element(tag="body"), "Login to lenovo-RD230-01 MAAS")
87- write_textfield("id_username", ADMIN_USER)
88- write_textfield("id_password", PASSWORD)
89- click_button("Login")
90- assert_url("MAAS/")
91- assert_title_contains("Dashboard")
92-
93- def test_integration(self):
94- # Run the integration tests in order.
95- self.installation()
96- self.createadmin_and_login()
97
98=== removed file 'debian/tests/maas-package-test'
99--- debian/tests/maas-package-test 2012-09-20 02:22:33 +0000
100+++ debian/tests/maas-package-test 1970-01-01 00:00:00 +0000
101@@ -1,5 +0,0 @@
102-#!/bin/sh
103-set -e -u
104-exec 2>&1
105-pip install sst
106-nosetests debian/tests/maas-integration.py

Subscribers

People subscribed via source and target branches