Commit fd87b5fe authored by Paul Rich's avatar Paul Rich
Browse files

Fixing sanity test for bsim use.

parent b4713721
...@@ -88,13 +88,13 @@ def test_nodeadm_combo_1(): ...@@ -88,13 +88,13 @@ def test_nodeadm_combo_1():
Command Output: Command Output:
Command Error/Debug:Option combinations not allowed with: up option(s) Command Error/Debug:nodeadm is only supported on cluster systems. Try partlist instead.
""" """
args = """--up --down p1""" args = """--up --down p1"""
exp_rs = 256 exp_rs = 0
user = pwd.getpwuid(os.getuid())[0] user = pwd.getpwuid(os.getuid())[0]
_args = args.replace('<USER>',user) _args = args.replace('<USER>',user)
...@@ -125,13 +125,13 @@ def test_nodeadm_combo_2(): ...@@ -125,13 +125,13 @@ def test_nodeadm_combo_2():
Command Output: Command Output:
Command Error/Debug:Option combinations not allowed with: list_nstates option(s) Command Error/Debug:nodeadm is only supported on cluster systems. Try partlist instead.
""" """
args = """--up -l p1""" args = """--up -l p1"""
exp_rs = 256 exp_rs = 0
user = pwd.getpwuid(os.getuid())[0] user = pwd.getpwuid(os.getuid())[0]
_args = args.replace('<USER>',user) _args = args.replace('<USER>',user)
...@@ -162,13 +162,13 @@ def test_nodeadm_combo_3(): ...@@ -162,13 +162,13 @@ def test_nodeadm_combo_3():
Command Output: Command Output:
Command Error/Debug:Option combinations not allowed with: queue option(s) Command Error/Debug:nodeadm is only supported on cluster systems. Try partlist instead.
""" """
args = """--list_nstates --queue q1 p1""" args = """--list_nstates --queue q1 p1"""
exp_rs = 256 exp_rs = 0
user = pwd.getpwuid(os.getuid())[0] user = pwd.getpwuid(os.getuid())[0]
_args = args.replace('<USER>',user) _args = args.replace('<USER>',user)
...@@ -199,13 +199,13 @@ def test_nodeadm_combo_4(): ...@@ -199,13 +199,13 @@ def test_nodeadm_combo_4():
Command Output: Command Output:
Command Error/Debug:Option combinations not allowed with: queue option(s) Command Error/Debug:nodeadm is only supported on cluster systems. Try partlist instead.
""" """
args = """--up --queue q1 p1""" args = """--up --queue q1 p1"""
exp_rs = 256 exp_rs = 0
user = pwd.getpwuid(os.getuid())[0] user = pwd.getpwuid(os.getuid())[0]
_args = args.replace('<USER>',user) _args = args.replace('<USER>',user)
...@@ -236,13 +236,13 @@ def test_nodeadm_combo_5(): ...@@ -236,13 +236,13 @@ def test_nodeadm_combo_5():
Command Output: Command Output:
Command Error/Debug:Option combinations not allowed with: list_nstates option(s) Command Error/Debug:nodeadm is only supported on cluster systems. Try partlist instead.
""" """
args = """--down --list_nstates p1""" args = """--down --list_nstates p1"""
exp_rs = 256 exp_rs = 0
user = pwd.getpwuid(os.getuid())[0] user = pwd.getpwuid(os.getuid())[0]
_args = args.replace('<USER>',user) _args = args.replace('<USER>',user)
...@@ -272,19 +272,9 @@ def test_nodeadm_up_1(): ...@@ -272,19 +272,9 @@ def test_nodeadm_up_1():
nodeadm test run: up_1 nodeadm test run: up_1
Command Output: Command Output:
nodes marked up:
U1
U2
U3
U4
U5
nodes that weren't in the down list:
p1
p2
p3
Command Error/Debug: Command Error/Debug:nodeadm is only supported on cluster systems. Try partlist instead.
""" """
...@@ -319,17 +309,9 @@ def test_nodeadm_up_2(): ...@@ -319,17 +309,9 @@ def test_nodeadm_up_2():
nodeadm test run: up_2 nodeadm test run: up_2
Command Output: Command Output:
nodes marked up:
U1
U2
U3
U4
U5
nodes that weren't in the down list: Command Error/Debug:nodeadm is only supported on cluster systems. Try partlist instead.
p1
Command Error/Debug:
""" """
...@@ -364,19 +346,9 @@ def test_nodeadm_down_1(): ...@@ -364,19 +346,9 @@ def test_nodeadm_down_1():
nodeadm test run: down_1 nodeadm test run: down_1
Command Output: Command Output:
nodes marked down:
D1
D2
D3
D4
D5
unknown nodes:
p1
p2
p3
Command Error/Debug: Command Error/Debug:nodeadm is only supported on cluster systems. Try partlist instead.
""" """
...@@ -411,17 +383,6 @@ def test_nodeadm_down_2(): ...@@ -411,17 +383,6 @@ def test_nodeadm_down_2():
nodeadm test run: down_2 nodeadm test run: down_2
Command Output: Command Output:
nodes marked down:
D1
D2
D3
D4
D5
unknown nodes:
p1
p2
p3
Command Error/Debug: Command Error/Debug:
nodeadm.py -d --down p1 p2 p3 nodeadm.py -d --down p1 p2 p3
...@@ -431,18 +392,7 @@ def test_nodeadm_down_2(): ...@@ -431,18 +392,7 @@ def test_nodeadm_down_2():
) )
component: "system.get_implementation", defer: False nodeadm is only supported on cluster systems. Try partlist instead.
get_implementation(
)
component: "system.nodes_down", defer: False
nodes_down(
['p1', 'p2', 'p3'],
gooduser,
)
""" """
...@@ -478,17 +428,9 @@ def test_nodeadm_down_3(): ...@@ -478,17 +428,9 @@ def test_nodeadm_down_3():
nodeadm test run: down_3 nodeadm test run: down_3
Command Output: Command Output:
nodes marked down:
D1
D2
D3
D4
D5
unknown nodes: Command Error/Debug:nodeadm is only supported on cluster systems. Try partlist instead.
p1
Command Error/Debug:
""" """
...@@ -523,16 +465,9 @@ def test_nodeadm_list_1(): ...@@ -523,16 +465,9 @@ def test_nodeadm_list_1():
nodeadm test run: list_1 nodeadm test run: list_1
Command Output: Command Output:
Host Queue State Backfill
==============================
D1 QD1 good -
D2 QD2 bad -
D3 QD3 ugly -
U1 QU1 one -
U2 QU2 two -
U3 QU3 three -
Command Error/Debug: Command Error/Debug:nodeadm is only supported on cluster systems. Try partlist instead.
""" """
...@@ -567,16 +502,9 @@ def test_nodeadm_list_2(): ...@@ -567,16 +502,9 @@ def test_nodeadm_list_2():
nodeadm test run: list_2 nodeadm test run: list_2
Command Output: Command Output:
Host Queue State Backfill
==============================
D1 QD1 good -
D2 QD2 bad -
D3 QD3 ugly -
U1 QU1 one -
U2 QU2 two -
U3 QU3 three -
Command Error/Debug: Command Error/Debug:nodeadm is only supported on cluster systems. Try partlist instead.
""" """
...@@ -652,7 +580,8 @@ def test_nodeadm_list_details_2(): ...@@ -652,7 +580,8 @@ def test_nodeadm_list_details_2():
Command Output: Command Output:
Command Error/Debug: Command Error/Debug:nodeadm is only supported on cluster systems. Try partlist instead.
""" """
...@@ -727,9 +656,9 @@ def test_nodeadm_queue_2(): ...@@ -727,9 +656,9 @@ def test_nodeadm_queue_2():
nodeadm test run: queue_2 nodeadm test run: queue_2
Command Output: Command Output:
QU1 QD1
Command Error/Debug: Command Error/Debug:nodeadm is only supported on cluster systems. Try partlist instead.
""" """
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment