Tests: Update regression node names, m6 times (#1608)

iotaledger · Sep 24, 2019 · 7c66049 · 7c66049
1 parent 4a42c6f
commit 7c66049
Show file tree

Hide file tree

Showing 13 changed files with 79 additions and 85 deletions.
diff --git a/python-regression/tests/features/machine1/1_api_tests.feature b/python-regression/tests/features/machine1/1_api_tests.feature
@@ -14,7 +14,7 @@ Feature: Test API calls on Machine 1
 		#See tests/features/steps/api_test_steps.py for further details
 		#
 
-		Given "getNodeInfo" is called on "nodeA" with:
+		Given "getNodeInfo" is called on "nodeA-m1" with:
 		|keys       |values				|type   	|
 
 		Then a response with the following is returned:
@@ -44,11 +44,11 @@ Feature: Test API calls on Machine 1
 
 	Scenario: GetNeighbors is called
 
-	    Given "addNeighbors" is called on "nodeA" with:
+	    Given "addNeighbors" is called on "nodeA-m1" with:
 		|keys       |values				|type           |
-		|uris       |nodeB				|nodeAddress    |
+		|uris       |nodeB-m1				|nodeAddress    |
 
-		And "getNeighbors" is called on "nodeA" with:
+		And "getNeighbors" is called on "nodeA-m1" with:
 		|keys       |values				|type   	|
 
 		Then a response with the following is returned:
@@ -66,21 +66,21 @@ Feature: Test API calls on Machine 1
 
 
 	Scenario: Add and Remove Neighbors
-		Adds nodeB as a neighbor to nodeA, and then removes it.
+		Adds nodeB-m1 as a neighbor to nodeA-m1, and then removes it.
 
-		Given "addNeighbors" is called on "nodeA" with:
+		Given "addNeighbors" is called on "nodeA-m1" with:
 		|keys       |values				|type           |
-		|uris       |nodeB				|nodeAddress    |
+		|uris       |nodeB-m1				|nodeAddress    |
 
 		Then a response with the following is returned:
 		|keys						|
 		|addedNeighbors                                 |
 		|duration					|
 
 
-		When "removeNeighbors" is called on "nodeA" with:
+		When "removeNeighbors" is called on "nodeA-m1" with:
 		|keys       |values				|type           |
-		|uris       |nodeB				|nodeAddress    |
+		|uris       |nodeB-m1				|nodeAddress    |
 
 
 		Then a response with the following is returned:
@@ -90,7 +90,7 @@ Feature: Test API calls on Machine 1
 
 
 	Scenario: GetTips is called
-		Given "getTips" is called on "nodeA" with:
+		Given "getTips" is called on "nodeA-m1" with:
 		|keys       |values				|type           |
 
 		Then a response with the following is returned:
@@ -102,7 +102,7 @@ Feature: Test API calls on Machine 1
 
     #Values can be found in util/static_vals.py
 	Scenario: GetTrytes is called
-		Given "getTrytes" is called on "nodeA" with:
+		Given "getTrytes" is called on "nodeA-m1" with:
 		|keys       |values             |type               |
 		|hashes     |TEST_HASH          |staticList         |
 
@@ -113,7 +113,7 @@ Feature: Test API calls on Machine 1
 
 
 	Scenario: GetTransactionsToApprove is called
-		Given "getTransactionsToApprove" is called on "nodeA" with:
+		Given "getTransactionsToApprove" is called on "nodeA-m1" with:
 		|keys       |values				|type           |
 		|depth      |3					|int            |
 
@@ -125,17 +125,17 @@ Feature: Test API calls on Machine 1
 
 
 	Scenario: CheckConsistency is called
-		Given "checkConsistency" is called on "nodeA" with:
+		Given "checkConsistency" is called on "nodeA-m1" with:
 		|keys           |values				|type           |
 		|tails          |TEST_HASH			|staticList     |
 
 		Then the response for "checkConsistency" should return with:
 		|keys           |values         |type           |
 		|state		|True           |bool           |
 
-		When an inconsistent transaction is generated on "nodeA"
+		When an inconsistent transaction is generated on "nodeA-m1"
 
-		And "checkConsistency" is called on "nodeA" with:
+		And "checkConsistency" is called on "nodeA-m1" with:
 		|keys           |values				|type           |
 		|tails          |inconsistentTransactions       |responseList   |
 
@@ -147,7 +147,7 @@ Feature: Test API calls on Machine 1
 
 	#Values can be found in util/static_vals.py
 	Scenario: GetInclusionStates is called
-		Given "getInclusionStates" is called on "nodeA" with:
+		Given "getInclusionStates" is called on "nodeA-m1" with:
 		|keys           |values				|type               |
 		|transactions   |TEST_HASH			|staticList         |
 		|tips           |TEST_TIP_LIST			|staticValue        |
@@ -159,7 +159,7 @@ Feature: Test API calls on Machine 1
 
 	#Address can be found in util/static_vals.py
 	Scenario: GetBalances is called
-		Given "getBalances" is called on "nodeA" with:
+		Given "getBalances" is called on "nodeA-m1" with:
 		|keys           |values			        |type               |
 		|addresses      |TEST_EMPTY_ADDRESS	        |staticList         |
 		|threshold      |100			        |int                |
@@ -173,15 +173,15 @@ Feature: Test API calls on Machine 1
 	    Begins attaching a transaction to the tangle with a high MWM, then issues an interrupt to the node
 	    If the interrupt is successful, the attachToTangle response will return a null tryte list
 
-		Given "attachToTangle" is called in parallel on "nodeA" with:
+		Given "attachToTangle" is called in parallel on "nodeA-m1" with:
 		|keys                   |values			|type           |
 		|trytes                 |EMPTY_TRANSACTION_TRYTES|staticList     |
 		|trunk_transaction      |TEST_HASH		|staticValue    |
 		|branch_transaction     |TEST_HASH		|staticValue    |
 		|min_weight_magnitude   |50			|int            |
 
 		And we wait "1" second/seconds
-		Then "interruptAttachingToTangle" is called in parallel on "nodeA" with:
+		Then "interruptAttachingToTangle" is called in parallel on "nodeA-m1" with:
 		|keys                   |values				|type           |
 
         # Do not include duration in the return expectations as it will always return a variable amount
@@ -192,7 +192,7 @@ Feature: Test API calls on Machine 1
 
 
 	Scenario: WereAddressesSpentFrom is called
-		Given "wereAddressesSpentFrom" is called on "nodeA" with:
+		Given "wereAddressesSpentFrom" is called on "nodeA-m1" with:
 		|keys       |values				|type               |
 		|addresses  |TEST_EMPTY_ADDRESS			|staticList         |
 
@@ -207,7 +207,7 @@ Feature: Test API calls on Machine 1
 		Generate a transaction, attach it to the tangle, and store it locally. Then find
 		that transaction via its address.
 
-		Given a transaction is generated and attached on "nodeA" with:
+		Given a transaction is generated and attached on "nodeA-m1" with:
 		|keys       |values				|type           |
 		|address    |TEST_STORE_ADDRESS			|staticValue    |
 		|value      |0					|int            |
@@ -216,11 +216,11 @@ Feature: Test API calls on Machine 1
 		|keys						|
 		|trytes						|
 
-		When "storeTransactions" is called on "nodeA" with:
+		When "storeTransactions" is called on "nodeA-m1" with:
 		|keys       |values				|type           |
 		|trytes     |TEST_STORE_TRANSACTION		|staticValue    |
 
-		And "findTransactions" is called on "nodeA" with:
+		And "findTransactions" is called on "nodeA-m1" with:
 		|keys       |values				|type           |
 		|addresses  |TEST_STORE_ADDRESS			|staticList     |
 
@@ -230,12 +230,12 @@ Feature: Test API calls on Machine 1
 
 
 
-	Scenario: Broadcast a test transacion
+	Scenario: Broadcast a test transaction
 		Send a test transaction from one node in a machine with a unique tag, and find that transaction
 		through a different node in the same machine
 
-		Given "nodeA" and "nodeB" are neighbors
-		When a transaction is generated and attached on "nodeA" with:
+		Given "nodeA-m1" and "nodeB-m1" are neighbors
+		When a transaction is generated and attached on "nodeA-m1" with:
 		|keys       |values				|type           |
 		|address    |TEST_ADDRESS			|staticValue    |
 		|tag        |TEST9TAG9ONE			|string         |
@@ -244,7 +244,7 @@ Feature: Test API calls on Machine 1
         #Give the transaction time to propagate
 		And we wait "3" second/seconds
 
-		And "findTransactions" is called on "nodeB" with:
+		And "findTransactions" is called on "nodeB-m1" with:
 		|keys       |values             |type           |
 		|tags       |TEST9TAG9ONE       |list           |
 

diff --git a/python-regression/tests/features/machine1/config.yml b/python-regression/tests/features/machine1/config.yml
@@ -19,8 +19,8 @@ seeds: # For internal use by the regression system.
     - SIID
 
 nodes:
-  nodeA: #name
+  nodeA-m1: #name
     <<: *api_tests_config_files
 
-  nodeB:
+  nodeB-m1:
     <<: *api_tests_config_files
diff --git a/python-regression/tests/features/machine2/2_transaction_tests.feature b/python-regression/tests/features/machine2/2_transaction_tests.feature
@@ -5,7 +5,7 @@ Feature: Test transaction confirmation
         A milestone will be issued that references these transactions, and this should
         confirm the transations.
 
-        Given "10" transactions are issued on "nodeA" with:
+        Given "10" transactions are issued on "nodeA-m2" with:
         |keys                   |values                     |type           |
         |address                |TEST_ADDRESS               |staticValue    |
         |value                  |0                          |int            |
@@ -19,7 +19,7 @@ Feature: Test transaction confirmation
         #Give the node 10 seconds to solidify the milestone
         And we wait "10" second/seconds
 
-        Then "getInclusionStates" is called on "nodeA" with:
+        Then "getInclusionStates" is called on "nodeA-m2" with:
         |keys                   |values                     |type           |
         |transactions           |evaluate_and_send          |responseValue  |
         |tips                   |latestMilestone            |configValue    |
@@ -35,7 +35,7 @@ Feature: Test transaction confirmation
         A milestone will be issued that references these transactions, and this should
         confirm the transations.
 
-        Given "10" transactions are issued on "nodeA" with:
+        Given "10" transactions are issued on "nodeA-m2" with:
         |keys                   |values                     |type           |
         |seed                   |THE_BANK                   |staticList     |
         |address                |TEST_ADDRESS               |staticValue    |
@@ -50,7 +50,7 @@ Feature: Test transaction confirmation
         #Give the node time to solidify the milestone
         And we wait "10" second/seconds
 
-        Then "getInclusionStates" is called on "nodeA" with:
+        Then "getInclusionStates" is called on "nodeA-m2" with:
         |keys                   |values                     |type           |
         |transactions           |evaluate_and_send          |responseValue  |
         |tips                   |latestMilestone            |configValue    |

diff --git a/python-regression/tests/features/machine2/config.yml b/python-regression/tests/features/machine2/config.yml
@@ -15,8 +15,5 @@ defaults: &transaction_tests_config_files
   java_options: -agentlib:jdwp=transport=dt_socket,server=y,address=8000,suspend=n -javaagent:/opt/jacoco/lib/jacocoagent.jar=destfile=/iri/jacoco.exec,output=file,append=true,dumponexit=true
 
 nodes:
-  nodeA: #name
-    <<: *transaction_tests_config_files
-
-  nodeB:
+  nodeA-m2: #name
     <<: *transaction_tests_config_files
diff --git a/python-regression/tests/features/machine3/3_blowball_tests.feature b/python-regression/tests/features/machine3/3_blowball_tests.feature
@@ -10,11 +10,11 @@ Feature: Test GTTA for blowballs
 		|keys           |values                 |type           |
 		|depth          |3                      |int            |
 
-		And "findTransactions" is called on "nodeA" with:
+		And "findTransactions" is called on "nodeA-m3" with:
 		|keys           |values                 |type           |
 		|addresses      |TEST_BLOWBALL_COO      |staticList     |
 
 		#Insert your testnet coordinator address above
 		Then the returned GTTA transactions will be compared with the milestones
-		And less than 5 percent of the returned transactions should reference milestones
+		And less than 5 percent of the returned transactions should be milestones
 
diff --git a/python-regression/tests/features/machine3/config.yml b/python-regression/tests/features/machine3/config.yml
@@ -19,21 +19,21 @@ seeds: # For internal use by the regression system.
     - SIID
 
 nodes:
-  nodeA: #name
+  nodeA-m3: #name
     <<: *blowball_tests_config_files
 
-  nodeB:
+  nodeB-m3:
     <<: *blowball_tests_config_files
 
-  nodeC:
+  nodeC-m3:
     <<: *blowball_tests_config_files
 
-  nodeD:
+  nodeD-m3:
     <<: *blowball_tests_config_files
 
-  nodeE:
+  nodeE-m3:
     <<: *blowball_tests_config_files
 
-  nodeF:
+  nodeF-m3:
     <<: *blowball_tests_config_files
 
diff --git a/python-regression/tests/features/machine4/4_stitching.feature b/python-regression/tests/features/machine4/4_stitching.feature
@@ -8,8 +8,8 @@ Feature: Ensure node reliability while stitching a side tangle
 
 	Scenario: Check consistency on a stitching transaction responds
 
-		Given a stitching transaction is issued on "nodeA" with the tag "STITCHING"
-		And "checkConsistency" is called in parallel on "nodeA" with:
+		Given a stitching transaction is issued on "nodeA-m4" with the tag "STITCHING"
+		And "checkConsistency" is called in parallel on "nodeA-m4" with:
 		|keys                   |values                 |type           |
 		|tails                  |previousTransaction    |responseList   |
 
@@ -19,7 +19,7 @@ Feature: Ensure node reliability while stitching a side tangle
 
 		When a transaction is issued referencing the previous transaction
 
-		And "getTransactionsToApprove" is called on "nodeA" with:
+		And "getTransactionsToApprove" is called on "nodeA-m4" with:
 		|keys                   |values                 |type           |
 		|depth                  |3                      |int            |
 

diff --git a/python-regression/tests/features/machine4/config.yml b/python-regression/tests/features/machine4/config.yml
@@ -19,8 +19,5 @@ seeds: # For internal use by the regression system.
     - SIID
 
 nodes:
-  nodeA: #name
-    <<: *stitching_tests_config_files
-
-  nodeB:
+  nodeA-m4: #name
     <<: *stitching_tests_config_files
diff --git a/python-regression/tests/features/machine5/5_milestone_validation.feature b/python-regression/tests/features/machine5/5_milestone_validation.feature
@@ -5,14 +5,14 @@ Feature: Test milestone validation
 
     Scenario: Verify current milestone index
 
-        Given "getNodeInfo" is called on "nodeA" with:
+        Given "getNodeInfo" is called on "nodeA-m5" with:
         |keys                   |values     |type       |
 
         Then the response for "getNodeInfo" should return with:
         |keys                   |values     |type       |
         |latestMilestoneIndex   |45         |int        |
 
-        And "getNodeInfo" is called on "nodeB" with:
+        And "getNodeInfo" is called on "nodeB-m5" with:
         |keys                   |values     |type       |
 
         Then the response for "getNodeInfo" should return with:

diff --git a/python-regression/tests/features/machine5/config.yml b/python-regression/tests/features/machine5/config.yml
@@ -34,8 +34,8 @@ seeds: # For internal use by the regression system.
     - SIID
 
 nodes:
-  nodeA: #name
+  nodeA-m5: #name
     <<: *no_validation_tests_config_files
 
-  nodeB:
+  nodeB-m5:
     <<: *validation_tests_config_files