Refactor out E2ETests to be separate from unit tests (#292)

OctopusDeploy · Oct 29, 2021 · 369f6e8 · 369f6e8
1 parent 2360776
commit 369f6e8
Show file tree

Hide file tree

Showing 54 changed files with 18 additions and 18 deletions.
diff --git a/Tests/.rspec → E2ETests/.rspec b/Tests/.rspec → E2ETests/.rspec
diff --git a/Tests/Gemfile → E2ETests/Gemfile b/Tests/Gemfile → E2ETests/Gemfile
diff --git a/Tests/Gemfile.lock → E2ETests/Gemfile.lock b/Tests/Gemfile.lock → E2ETests/Gemfile.lock
diff --git a/Tests/Rakefile → E2ETests/Rakefile b/Tests/Rakefile → E2ETests/Rakefile
diff --git a/Tests/Scenarios/Configuration.psd1 → E2ETests/Scenarios/Configuration.psd1 b/Tests/Scenarios/Configuration.psd1 → E2ETests/Scenarios/Configuration.psd1
diff --git a/.../Scenarios/Server_Scenario_01_Install.ps1 → .../Scenarios/Server_Scenario_01_Install.ps1 b/.../Scenarios/Server_Scenario_01_Install.ps1 → .../Scenarios/Server_Scenario_01_Install.ps1
diff --git a/...erver_Scenario_02_Install_Second_Node.ps1 → ...erver_Scenario_02_Install_Second_Node.ps1 b/...erver_Scenario_02_Install_Second_Node.ps1 → ...erver_Scenario_02_Install_Second_Node.ps1
diff --git a/...s/Scenarios/Server_Scenario_03_Remove.ps1 → ...s/Scenarios/Server_Scenario_03_Remove.ps1 b/...s/Scenarios/Server_Scenario_03_Remove.ps1 → ...s/Scenarios/Server_Scenario_03_Remove.ps1
diff --git a/...Server_Scenario_04_Remove_Second_Node.ps1 → ...Server_Scenario_04_Remove_Second_Node.ps1 b/...Server_Scenario_04_Remove_Second_Node.ps1 → ...Server_Scenario_04_Remove_Second_Node.ps1
diff --git a/...r_Scenario_05_Install_Custom_Instance.ps1 → ...r_Scenario_05_Install_Custom_Instance.ps1 b/...r_Scenario_05_Install_Custom_Instance.ps1 → ...r_Scenario_05_Install_Custom_Instance.ps1
diff --git a/...er_Scenario_06_Remove_Custom_Instance.ps1 → ...er_Scenario_06_Remove_Custom_Instance.ps1 b/...er_Scenario_06_Remove_Custom_Instance.ps1 → ...er_Scenario_06_Remove_Custom_Instance.ps1
diff --git a/...cenarios/Server_Scenario_07_Reinstall.ps1 → ...cenarios/Server_Scenario_07_Reinstall.ps1 b/...cenarios/Server_Scenario_07_Reinstall.ps1 → ...cenarios/Server_Scenario_07_Reinstall.ps1
diff --git a/.../Scenarios/Server_Scenario_08_Upgrade.ps1 → .../Scenarios/Server_Scenario_08_Upgrade.ps1 b/.../Scenarios/Server_Scenario_08_Upgrade.ps1 → .../Scenarios/Server_Scenario_08_Upgrade.ps1
diff --git a/...os/Server_Scenario_09_Watchdog_Create.ps1 → ...os/Server_Scenario_09_Watchdog_Create.ps1 b/...os/Server_Scenario_09_Watchdog_Create.ps1 → ...os/Server_Scenario_09_Watchdog_Create.ps1
diff --git a/...os/Server_Scenario_10_Watchdog_Delete.ps1 → ...os/Server_Scenario_10_Watchdog_Delete.ps1 b/...os/Server_Scenario_10_Watchdog_Delete.ps1 → ...os/Server_Scenario_10_Watchdog_Delete.ps1
diff --git a/...s/Scenarios/Server_Scenario_11_Remove.ps1 → ...s/Scenarios/Server_Scenario_11_Remove.ps1 b/...s/Scenarios/Server_Scenario_11_Remove.ps1 → ...s/Scenarios/Server_Scenario_11_Remove.ps1
diff --git a/...os/Server_Scenario_12_Built_In_Worker.ps1 → ...os/Server_Scenario_12_Built_In_Worker.ps1 b/...os/Server_Scenario_12_Built_In_Worker.ps1 → ...os/Server_Scenario_12_Built_In_Worker.ps1
diff --git a/...s/Scenarios/Server_Scenario_13_Remove.ps1 → ...s/Scenarios/Server_Scenario_13_Remove.ps1 b/...s/Scenarios/Server_Scenario_13_Remove.ps1 → ...s/Scenarios/Server_Scenario_13_Remove.ps1
diff --git a/...Scenario_14_Install_Without_Configure.ps1 → ...Scenario_14_Install_Without_Configure.ps1 b/...Scenario_14_Install_Without_Configure.ps1 → ...Scenario_14_Install_Without_Configure.ps1
diff --git a/...io_15_Configure_Preinstalled_Instance.ps1 → ...io_15_Configure_Preinstalled_Instance.ps1 b/...io_15_Configure_Preinstalled_Instance.ps1 → ...io_15_Configure_Preinstalled_Instance.ps1
diff --git a/...cenarios/Tentacle_Scenario_01_Install.ps1 → ...cenarios/Tentacle_Scenario_01_Install.ps1 b/...cenarios/Tentacle_Scenario_01_Install.ps1 → ...cenarios/Tentacle_Scenario_01_Install.ps1
diff --git a/...Scenarios/Tentacle_Scenario_02_Remove.ps1 → ...Scenarios/Tentacle_Scenario_02_Remove.ps1 b/...Scenarios/Tentacle_Scenario_02_Remove.ps1 → ...Scenarios/Tentacle_Scenario_02_Remove.ps1
diff --git a/...narios/Tentacle_Scenario_03_Reinstall.ps1 → ...narios/Tentacle_Scenario_03_Reinstall.ps1 b/...narios/Tentacle_Scenario_03_Reinstall.ps1 → ...narios/Tentacle_Scenario_03_Reinstall.ps1
diff --git a/...cenarios/Tentacle_Scenario_04_Upgrade.ps1 → ...cenarios/Tentacle_Scenario_04_Upgrade.ps1 b/...cenarios/Tentacle_Scenario_04_Upgrade.ps1 → ...cenarios/Tentacle_Scenario_04_Upgrade.ps1
diff --git a/.../Tentacle_Scenario_05_Watchdog_Create.ps1 → .../Tentacle_Scenario_05_Watchdog_Create.ps1 b/.../Tentacle_Scenario_05_Watchdog_Create.ps1 → .../Tentacle_Scenario_05_Watchdog_Create.ps1
diff --git a/.../Tentacle_Scenario_06_Watchdog_Delete.ps1 → .../Tentacle_Scenario_06_Watchdog_Delete.ps1 b/.../Tentacle_Scenario_06_Watchdog_Delete.ps1 → .../Tentacle_Scenario_06_Watchdog_Delete.ps1
diff --git a/...Scenarios/Tentacle_Scenario_07_Remove.ps1 → ...Scenarios/Tentacle_Scenario_07_Remove.ps1 b/...Scenarios/Tentacle_Scenario_07_Remove.ps1 → ...Scenarios/Tentacle_Scenario_07_Remove.ps1
diff --git a/...tacle_Scenario_08_Tentacle_Comms_Port.ps1 → ...tacle_Scenario_08_Tentacle_Comms_Port.ps1 b/...tacle_Scenario_08_Tentacle_Comms_Port.ps1 → ...tacle_Scenario_08_Tentacle_Comms_Port.ps1
diff --git a/...s/Spec/server_scenario_01_install_spec.rb → ...s/Spec/server_scenario_01_install_spec.rb b/...s/Spec/server_scenario_01_install_spec.rb → ...s/Spec/server_scenario_01_install_spec.rb
diff --git a/...r_scenario_02_install_second_node_spec.rb → ...r_scenario_02_install_second_node_spec.rb b/...r_scenario_02_install_second_node_spec.rb → ...r_scenario_02_install_second_node_spec.rb
diff --git a/Tests/Spec/server_scenario_03_remove_spec.rb → ...ts/Spec/server_scenario_03_remove_spec.rb b/Tests/Spec/server_scenario_03_remove_spec.rb → ...ts/Spec/server_scenario_03_remove_spec.rb
diff --git a/...er_scenario_04_remove_second_node_spec.rb → ...er_scenario_04_remove_second_node_spec.rb b/...er_scenario_04_remove_second_node_spec.rb → ...er_scenario_04_remove_second_node_spec.rb
diff --git a/...enario_05_install_custom_instance_spec.rb → ...enario_05_install_custom_instance_spec.rb b/...enario_05_install_custom_instance_spec.rb → ...enario_05_install_custom_instance_spec.rb
diff --git a/...cenario_06_remove_custom_instance_spec.rb → ...cenario_06_remove_custom_instance_spec.rb b/...cenario_06_remove_custom_instance_spec.rb → ...cenario_06_remove_custom_instance_spec.rb
diff --git a/...Spec/server_scenario_07_reinstall_spec.rb → ...Spec/server_scenario_07_reinstall_spec.rb b/...Spec/server_scenario_07_reinstall_spec.rb → ...Spec/server_scenario_07_reinstall_spec.rb
diff --git a/...s/Spec/server_scenario_08_upgrade_spec.rb → ...s/Spec/server_scenario_08_upgrade_spec.rb b/...s/Spec/server_scenario_08_upgrade_spec.rb → ...s/Spec/server_scenario_08_upgrade_spec.rb
diff --git a/...erver_scenario_09_watchdog_create_spec.rb → ...erver_scenario_09_watchdog_create_spec.rb b/...erver_scenario_09_watchdog_create_spec.rb → ...erver_scenario_09_watchdog_create_spec.rb
diff --git a/...erver_scenario_10_watchdog_delete_spec.rb → ...erver_scenario_10_watchdog_delete_spec.rb b/...erver_scenario_10_watchdog_delete_spec.rb → ...erver_scenario_10_watchdog_delete_spec.rb
diff --git a/Tests/Spec/server_scenario_11_remove_spec.rb → ...ts/Spec/server_scenario_11_remove_spec.rb b/Tests/Spec/server_scenario_11_remove_spec.rb → ...ts/Spec/server_scenario_11_remove_spec.rb
diff --git a/...erver_scenario_12_built_in_worker_spec.rb → ...erver_scenario_12_built_in_worker_spec.rb b/...erver_scenario_12_built_in_worker_spec.rb → ...erver_scenario_12_built_in_worker_spec.rb
diff --git a/Tests/Spec/server_scenario_13_remove_spec.rb → ...ts/Spec/server_scenario_13_remove_spec.rb b/Tests/Spec/server_scenario_13_remove_spec.rb → ...ts/Spec/server_scenario_13_remove_spec.rb
diff --git a/...ario_14_install_without_configure_spec.rb → ...ario_14_install_without_configure_spec.rb b/...ario_14_install_without_configure_spec.rb → ...ario_14_install_without_configure_spec.rb
diff --git a/...5_configure_preinstalled_instance_spec.rb → ...5_configure_preinstalled_instance_spec.rb b/...5_configure_preinstalled_instance_spec.rb → ...5_configure_preinstalled_instance_spec.rb
diff --git a/Tests/Spec/spec_helper.rb → E2ETests/Spec/spec_helper.rb b/Tests/Spec/spec_helper.rb → E2ETests/Spec/spec_helper.rb
diff --git a/...Spec/tentacle_scenario_01_install_spec.rb → ...Spec/tentacle_scenario_01_install_spec.rb b/...Spec/tentacle_scenario_01_install_spec.rb → ...Spec/tentacle_scenario_01_install_spec.rb
diff --git a/.../Spec/tentacle_scenario_02_remove_spec.rb → .../Spec/tentacle_scenario_02_remove_spec.rb b/.../Spec/tentacle_scenario_02_remove_spec.rb → .../Spec/tentacle_scenario_02_remove_spec.rb
diff --git a/...ec/tentacle_scenario_03_reinstall_spec.rb → ...ec/tentacle_scenario_03_reinstall_spec.rb b/...ec/tentacle_scenario_03_reinstall_spec.rb → ...ec/tentacle_scenario_03_reinstall_spec.rb
diff --git a/...Spec/tentacle_scenario_04_upgrade_spec.rb → ...Spec/tentacle_scenario_04_upgrade_spec.rb b/...Spec/tentacle_scenario_04_upgrade_spec.rb → ...Spec/tentacle_scenario_04_upgrade_spec.rb
diff --git a/...tacle_scenario_05_watchdog_create_spec.rb → ...tacle_scenario_05_watchdog_create_spec.rb b/...tacle_scenario_05_watchdog_create_spec.rb → ...tacle_scenario_05_watchdog_create_spec.rb
diff --git a/...tacle_scenario_06_watchdog_delete_spec.rb → ...tacle_scenario_06_watchdog_delete_spec.rb b/...tacle_scenario_06_watchdog_delete_spec.rb → ...tacle_scenario_06_watchdog_delete_spec.rb
diff --git a/.../Spec/tentacle_scenario_07_remove_spec.rb → .../Spec/tentacle_scenario_07_remove_spec.rb b/.../Spec/tentacle_scenario_07_remove_spec.rb → .../Spec/tentacle_scenario_07_remove_spec.rb
diff --git a/...e_scenario_08_tentacle_comms_port_spec.rb → ...e_scenario_08_tentacle_comms_port_spec.rb b/...e_scenario_08_tentacle_comms_port_spec.rb → ...e_scenario_08_tentacle_comms_port_spec.rb
diff --git a/Tests/OctopusDSC.Tests.ps1 b/Tests/OctopusDSC.Tests.ps1
@@ -49,7 +49,7 @@ Describe "OctopusDSC" {
                     #even though it works fine on ubuntu locally
                     Set-ItResult -Inconclusive -Because "We couldnt get this test to run on our CentOS buildagent"
                 } else {
-                    $path = Resolve-Path "$PSCommandPath/../../Tests/Scenarios"
+                    $path = Resolve-Path "$PSCommandPath/../../E2ETests/Scenarios"
                     Write-Output "Running PsScriptAnalyzer against $path"
                     $results = @(Invoke-ScriptAnalyzer $path -recurse -exclude @('PSUseShouldProcessForStateChangingFunctions', 'PSAvoidUsingConvertToSecureStringWithPlainText'))
                     $results | ConvertTo-Json | Out-File PsScriptAnalyzer-Scenarios.log
@@ -288,22 +288,22 @@ Describe "OctopusDSC" {
 
     Describe "Configuration Scenarios" {
         BeforeDiscovery {
-            $path = Resolve-Path "$PSCommandPath/../../Tests/Scenarios"
+            $path = Resolve-Path "$PSCommandPath/../../E2ETests/Scenarios"
             $name = @{label="name";expression={[System.Io.Path]::GetFileNameWithoutExtension($_.Name)}};
             $fullName = @{label="fullName";expression={$_.FullName}};
+            $specPath = @{label="specPath";expression={"$path/../Spec/$([System.Io.Path]::GetFileNameWithoutExtension($_.Name).ToLower() + '_spec.rb')"}};
 
-            $cases = @(Get-ChildItem $path -Recurse -Filter *.ps1 | Select-Object -Property $name, $fullName) | ConvertTo-Hashtable
+            $cases = @(Get-ChildItem $path -Recurse -Filter *.ps1 | Select-Object -Property $name, $fullName, $specPath) | ConvertTo-Hashtable
         }
 
         It "Configuration block in scenario <name> should have the same name as the file" -ForEach $cases {
             param([string]$name, [string]$fullName)
             $fullName | Should -FileContentMatch "Configuration $name"
         }
 
-        It "Scenario <name> should have a matching spec" -ForEach $cases {
-            param([string]$name, [string]$fullName)
-            $specName = ($name + '_spec.rb').ToLower()
-            (Resolve-Path "$PSCommandPath/../../Tests/Spec/$specName") | Should -Exist
+        It "Scenario <name> should have a matching spec at <specPath>" -ForEach $cases {
+            param([string]$name, [string]$fullName, [string]$specPath)
+            (Resolve-Path $specPath) | Should -Exist
         }
     }
-}
+}
diff --git a/vagrantfile b/vagrantfile
@@ -49,8 +49,8 @@ def run_octopus_scenario(config, scenario, log_files)
   config.vm.provision "shell", inline: "write-output \"##teamcity[blockOpened name='Running Scenario #{scenario}']\""
   config.vm.provision "dsc" do |dsc|
     dsc.configuration_file  = "#{scenario}.ps1"
-    dsc.configuration_data_file  = "Tests/Scenarios/Configuration.psd1"
-    dsc.manifests_path = "Tests/Scenarios/"
+    dsc.configuration_data_file  = "E2ETests/Scenarios/Configuration.psd1"
+    dsc.manifests_path = "E2ETests/Scenarios/"
     dsc.abort_on_dsc_failure = true
   end
   config.vm.provision "shell", inline: "write-output \"##teamcity[blockClosed name='Running Scenario #{scenario}']\""
@@ -63,8 +63,8 @@ def run_tentacle_scenario(config, scenario, log_files)
   config.vm.provision "shell", inline: "write-output \"##teamcity[blockOpened name='Running Scenario #{scenario}']\""
   config.vm.provision "dsc" do |dsc|
     dsc.configuration_file  = "#{scenario}.ps1"
-    dsc.configuration_data_file  = "Tests/Scenarios/Configuration.psd1"
-    dsc.manifests_path = "Tests/Scenarios/"
+    dsc.configuration_data_file  = "E2ETests/Scenarios/Configuration.psd1"
+    dsc.manifests_path = "E2ETests/Scenarios/"
     dsc.abort_on_dsc_failure = true
   end
   config.vm.provision "shell", inline: "write-output \"##teamcity[blockClosed name='Running Scenario #{scenario}']\""
@@ -165,7 +165,7 @@ Vagrant.configure(VAGRANT_FILE_API_VERSION) do |config|
   # delete existing tests if they exist (for dev)
   config.vm.provision "shell", inline: "if (Test-Path 'c:\\temp\\tests') {remove-item -force -recurse 'c:\\temp\\tests' }"
   # upload tests
-  config.vm.provision "file", source: "Tests", destination: "c:\\temp\\tests"
+  config.vm.provision "file", source: "E2ETests", destination: "c:\\temp\\tests"
   config.vm.provision "shell", path: "Tests/install-test-dependencies.ps1"
   # in theory, we shouldn't have to do this - the vagrant-dsc should upload it automatically, but cant get it to work
   config.vm.provision "file", source: "OctopusDSC", destination: 'C:\Windows\System32\WindowsPowerShell\v1.0\modules\OctopusDSC'
@@ -269,8 +269,8 @@ Vagrant.configure(VAGRANT_FILE_API_VERSION) do |config|
        'C:/Octopus/Logs/OctopusServer.txt',
        'C:/Octopus/OctopusServer-ConfigurePreInstalledInstance.config',
        'C:/Octopus/OctopusServer-OctopusServer.config'])
-    config.vm.provision "shell", inline: "& c:\\temp\\Tests\\register-polling-tentacle.ps1; exit $LASTEXITCODE"
-    config.vm.provision "shell", inline: "& c:\\temp\\Tests\\trigger-and-wait-for-healthcheck.ps1; exit $LASTEXITCODE"
+    config.vm.provision "shell", path: "Tests/register-polling-tentacle.ps1"
+    config.vm.provision "shell", path: "Tests/trigger-and-wait-for-healthcheck.ps1"
     config.vm.provision "shell", inline: $run_test_scenario_script.gsub('{scenario_name}', 'tentacle_scenario_01_install')
 
     # uninstall tentacle
@@ -282,7 +282,7 @@ Vagrant.configure(VAGRANT_FILE_API_VERSION) do |config|
        'C:/Octopus/Logs/trigger-and-wait-for-healthcheck.txt',
        'C:/Octopus/OctopusServer-ConfigurePreInstalledInstance.config',
        'C:/Octopus/OctopusServer-OctopusServer.config'])
-    config.vm.provision "shell", inline: "& c:\\temp\\Tests\\trigger-and-wait-for-healthcheck.ps1; exit $LASTEXITCODE"
+    config.vm.provision "shell", path: "Tests/trigger-and-wait-for-healthcheck.ps1"
     config.vm.provision "shell", inline: $run_test_scenario_script.gsub('{scenario_name}', 'tentacle_scenario_02_remove')
 
     # Install old version
@@ -296,7 +296,7 @@ Vagrant.configure(VAGRANT_FILE_API_VERSION) do |config|
        'C:/Octopus/OctopusServer-OctopusServer.config',
        'C:/Octopus/OctopusTentacleHome/Logs/OctopusTentacle.txt',
        'C:/Octopus/OctopusTentacleHome/Tentacle/Tentacle.config'])
-    config.vm.provision "shell", inline: "& c:\\temp\\Tests\\trigger-and-wait-for-healthcheck.ps1; exit $LASTEXITCODE"
+    config.vm.provision "shell", path: "Tests/trigger-and-wait-for-healthcheck.ps1"
     config.vm.provision "shell", inline: $run_test_scenario_script.gsub('{scenario_name}', 'tentacle_scenario_03_reinstall')
 
     # Upgrade it
@@ -310,7 +310,7 @@ Vagrant.configure(VAGRANT_FILE_API_VERSION) do |config|
        'C:/Octopus/OctopusServer-OctopusServer.config',
        'C:/Octopus/OctopusTentacleHome/Logs/OctopusTentacle.txt',
        'C:/Octopus/OctopusTentacleHome/Tentacle/Tentacle.config'])
-    config.vm.provision "shell", inline: "& c:\\temp\\Tests\\trigger-and-wait-for-healthcheck.ps1; exit $LASTEXITCODE"
+    config.vm.provision "shell", path: "Tests/trigger-and-wait-for-healthcheck.ps1"
     config.vm.provision "shell", inline: $run_test_scenario_script.gsub('{scenario_name}', 'tentacle_scenario_04_upgrade')
 
     # install watchdog