MAAS

Merge ~d0ugal/maas:provserver-tests into maas:master

  1. Git
  2. lp:~d0ugal/maas
  3. provserver-tests
  4. Merge into master
Proposed by Dougal Matthews
Status: Merged
Approved by: Dougal Matthews
Approved revision: e4b5cc444d6c19ddcd1a72790d0cf9dc13a6392b
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~d0ugal/maas:provserver-tests
Merge into: maas:master
Diff against target: 77 lines (+12/-6)
3 files modified
src/maastesting/scripts.py (+4/-3)
src/provisioningserver/drivers/power/tests/test_base.py (+6/-3)
src/provisioningserver/tests/test_config.py (+2/-0)
Reviewer Review Type Date Requested Status
MAAS Lander Approve
Lee Trager (community) Approve
Alberto Donato (community) Approve
Review via email: mp+385351@code.launchpad.net

Commit message

Include the provisioningserver tests in ./bin/test.rack
This change also removes the apiclient and maascli tests from
this script.

To post a comment you must log in.
Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b provserver-tests lp:~d0ugal/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas/job/branch-tester/7662/console
COMMIT: 72bdd284faa8af26086f90d36abf60c1e38a2971

review: Needs Fixing
Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b provserver-tests lp:~d0ugal/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas/job/branch-tester/7669/console
COMMIT: 834f771c6ba2d621c48427ea457289e8b5283028

review: Needs Fixing
Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b provserver-tests lp:~d0ugal/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas/job/branch-tester/7670/console
COMMIT: 0ff0f762249155412bb9448b7d43df0bc0363571

review: Needs Fixing
Revision history for this message
Alberto Donato (ack) wrote :

+1 with a small nit

review: Approve
Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b provserver-tests lp:~d0ugal/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas/job/branch-tester/7672/console
COMMIT: fc5659e5bad283e1eab19aa5a640d4f8ce93f690

review: Needs Fixing
Revision history for this message
MAAS Lander (maas-lander) wrote :

LANDING
-b provserver-tests lp:~d0ugal/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci.internal:8080/job/maas/job/branch-tester/7674/consoleText

Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b provserver-tests lp:~d0ugal/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas/job/branch-tester/7676/console
COMMIT: c197614b3388d561c0578808bd0dda7427d2a883

review: Needs Fixing
Revision history for this message
Lee Trager (ltrager) wrote :

I merged a fix for the maas_certificates failure at https://code.launchpad.net/~ltrager/maas/+git/maas/+merge/385412

Please merge master and remove the expected failure.

Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b provserver-tests lp:~d0ugal/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas/job/branch-tester/7678/console
COMMIT: 31ddece8c7139ade79efcebdebff3458e6e3e171

review: Needs Fixing
Revision history for this message
Lee Trager (ltrager) wrote :

Thanks!

review: Approve
Revision history for this message
MAAS Lander (maas-lander) wrote :

LANDING
-b provserver-tests lp:~d0ugal/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci.internal:8080/job/maas/job/branch-tester/7679/consoleText

~d0ugal/maas:provserver-tests updated
965f234... by Dougal Matthews

Add expected failure for the test failing in CI

Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b provserver-tests lp:~d0ugal/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas/job/branch-tester/7680/console
COMMIT: 2e31a2d8f4f1b86fa32ac1f49522dbf1058298d7

review: Needs Fixing
~d0ugal/maas:provserver-tests updated
299f08d... by Dougal Matthews

Add bug reference

e4b5cc4... by Dougal Matthews

Blacken

Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b provserver-tests lp:~d0ugal/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas/job/branch-tester/7682/console
COMMIT: 73053119e1b965167e73b008ca49dd32bb7b35c0

review: Needs Fixing
Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b provserver-tests lp:~d0ugal/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: dba31fc6e8ce775e4666c5e06d71a9e5d2a9a903

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/maastesting/scripts.py b/src/maastesting/scripts.py
2index b8304c6..eaf3d4c 100644
3--- a/src/maastesting/scripts.py
4+++ b/src/maastesting/scripts.py
5@@ -110,12 +110,13 @@ def run_region_legacy():
6 def run_rack():
7 """Entry point for rack test runner."""
8 options = [
9+ "--with-crochet",
10+ "--crochet-no-setup",
11 "--with-resources",
12 "--with-scenarios",
13 "--with-select",
14- "--select-dir=src/apiclient",
15- "--select-dir=src/maascli",
16- "--cover-package=apiclient,maascli",
17+ "--select-dir=src/provisioningserver",
18+ "--cover-package=provisioningserver",
19 "--cover-branches",
20 ]
21 inject_test_options(options)
22diff --git a/src/provisioningserver/drivers/power/tests/test_base.py b/src/provisioningserver/drivers/power/tests/test_base.py
23index 2635666..0e6039e 100644
24--- a/src/provisioningserver/drivers/power/tests/test_base.py
25+++ b/src/provisioningserver/drivers/power/tests/test_base.py
26@@ -48,10 +48,11 @@ class FakePowerDriverBase(PowerDriverBase):
27 ip_extractor = None
28 queryable = True
29
30- def __init__(self, name, description, settings):
31+ def __init__(self, name, description, settings, chassis=False):
32 self.name = name
33 self.description = description
34 self.settings = settings
35+ self.chassis = chassis
36 super(FakePowerDriverBase, self).__init__()
37
38 def on(self, system_id, context):
39@@ -70,14 +71,16 @@ class FakePowerDriverBase(PowerDriverBase):
40 return []
41
42
43-def make_power_driver_base(name=None, description=None, settings=None):
44+def make_power_driver_base(
45+ name=None, description=None, settings=None, chassis=False
46+):
47 if name is None:
48 name = factory.make_name("diskless")
49 if description is None:
50 description = factory.make_name("description")
51 if settings is None:
52 settings = []
53- return FakePowerDriverBase(name, description, settings)
54+ return FakePowerDriverBase(name, description, settings, chassis)
55
56
57 class TestFakePowerDriverBase(MAASTestCase):
58diff --git a/src/provisioningserver/tests/test_config.py b/src/provisioningserver/tests/test_config.py
59index 6a20c7c..0fe50e2 100644
60--- a/src/provisioningserver/tests/test_config.py
61+++ b/src/provisioningserver/tests/test_config.py
62@@ -9,6 +9,7 @@ import contextlib
63 from operator import delitem, methodcaller, setitem
64 import os.path
65 import sqlite3
66+from unittest import expectedFailure
67 from unittest.mock import sentinel
68 from uuid import uuid4
69
70@@ -651,6 +652,7 @@ class TestClusterConfiguration(MAASTestCase):
71 # It's also stored in the configuration database.
72 self.assertEqual({"tftp_port": example_port}, config.store)
73
74+ @expectedFailure # See https://bugs.launchpad.net/maas/+bug/1882903
75 def test_default_tftp_root(self):
76 config = ClusterConfiguration({})
77 self.assertEqual(

Subscribers

People subscribed via source and target branches