diff --git a/functional_tests/features/bind.feature b/functional_tests/features/bind.feature index 9ced2115a..f6d2651a2 100644 --- a/functional_tests/features/bind.feature +++ b/functional_tests/features/bind.feature @@ -58,7 +58,6 @@ Scenario: Backup and restore bind And I create a backup of the bind app data And I set bind forwarders to 1.0.0.1 And I enable bind DNSSEC - And I export the bind app data backup And I restore the bind app data backup Then bind forwarders should be 1.1.1.1 And bind DNSSEC should be disabled diff --git a/functional_tests/features/coquelicot.feature b/functional_tests/features/coquelicot.feature index 909073f07..9ef9c2145 100644 --- a/functional_tests/features/coquelicot.feature +++ b/functional_tests/features/coquelicot.feature @@ -62,7 +62,6 @@ Scenario: Backup and restore coquelicot And I modify the maximum file size of coquelicot to 128 And I upload the sample local file to coquelicot with password beforebackup123 And I create a backup of the coquelicot app data - And I export the coquelicot app data backup And I modify the coquelicot upload password to afterbackup123 And I modify the maximum file size of coquelicot to 64 And I restore the coquelicot app data backup diff --git a/functional_tests/features/date_and_time.feature b/functional_tests/features/date_and_time.feature index b35205fa6..ca3218c77 100644 --- a/functional_tests/features/date_and_time.feature +++ b/functional_tests/features/date_and_time.feature @@ -40,6 +40,5 @@ Scenario: Backup and restore datetime When I set the time zone to Africa/Accra And I create a backup of the datetime app data And I set the time zone to Africa/Addis_Ababa - And I export the datetime app data backup And I restore the datetime app data backup Then the time zone should be Africa/Accra diff --git a/functional_tests/features/deluge.feature b/functional_tests/features/deluge.feature index 8eff5514e..54ceefeb1 100644 --- a/functional_tests/features/deluge.feature +++ b/functional_tests/features/deluge.feature @@ -44,7 +44,6 @@ Scenario: Backup and restore deluge When all torrents are removed from deluge And I upload a sample torrent to deluge And I create a backup of the deluge app data - And I export the deluge app data backup And all torrents are removed from deluge And I restore the deluge app data backup Then the deluge service should be running diff --git a/functional_tests/features/dynamicdns.feature b/functional_tests/features/dynamicdns.feature index 6cc923148..f67e4193f 100644 --- a/functional_tests/features/dynamicdns.feature +++ b/functional_tests/features/dynamicdns.feature @@ -27,6 +27,5 @@ Scenario: Backup and restore configuration Given dynamicdns is configured When I create a backup of the dynamicdns app data And I change the dynamicdns configuration - And I export the dynamicdns app data backup And I restore the dynamicdns app data backup Then dynamicdns should have the original configuration diff --git a/functional_tests/features/ejabberd.feature b/functional_tests/features/ejabberd.feature index def0ebcf2..6f1f51e93 100644 --- a/functional_tests/features/ejabberd.feature +++ b/functional_tests/features/ejabberd.feature @@ -48,6 +48,5 @@ Scenario: Backup and restore ejabberd And I have added a contact to my roster When I create a backup of the ejabberd app data And I delete the contact from my roster - And I export the ejabberd app data backup And I restore the ejabberd app data backup Then I should have a contact on my roster diff --git a/functional_tests/features/ikiwiki.feature b/functional_tests/features/ikiwiki.feature index a196097f5..389dadfe2 100644 --- a/functional_tests/features/ikiwiki.feature +++ b/functional_tests/features/ikiwiki.feature @@ -38,6 +38,5 @@ Scenario: Backup and restore wiki When there is an ikiwiki wiki And I create a backup of the ikiwiki app data And I delete the ikiwiki wiki - And I export the ikiwiki app data backup And I restore the ikiwiki app data backup Then the ikiwiki wiki should be restored diff --git a/functional_tests/features/jsxc.feature b/functional_tests/features/jsxc.feature index 83dea3d41..2581e333a 100644 --- a/functional_tests/features/jsxc.feature +++ b/functional_tests/features/jsxc.feature @@ -29,6 +29,5 @@ Scenario: Install jsxc application Scenario: Backup and restore jsxc Given the jsxc application is installed When I create a backup of the jsxc app data - And I export the jsxc app data backup And I restore the jsxc app data backup Then the jsxc site should be available diff --git a/functional_tests/features/mediawiki.feature b/functional_tests/features/mediawiki.feature index 67affc179..329363a05 100644 --- a/functional_tests/features/mediawiki.feature +++ b/functional_tests/features/mediawiki.feature @@ -88,7 +88,6 @@ Scenario: Backup and restore mediawiki When I create a backup of the mediawiki app data When I enable mediawiki public registrations And I delete the mediawiki main page - And I export the mediawiki app data backup And I restore the mediawiki app data backup Then the mediawiki main page should be restored Then the mediawiki site should allow creating accounts diff --git a/functional_tests/features/mumble.feature b/functional_tests/features/mumble.feature index 8bc389a5a..3fc2ee317 100644 --- a/functional_tests/features/mumble.feature +++ b/functional_tests/features/mumble.feature @@ -38,6 +38,5 @@ Scenario: Disable mumble application Scenario: Backup and restore mumble Given the mumble application is enabled When I create a backup of the mumble app data - And I export the mumble app data backup And I restore the mumble app data backup Then the mumble service should be running diff --git a/functional_tests/features/pagekite.feature b/functional_tests/features/pagekite.feature index b421ec883..ca1f76589 100644 --- a/functional_tests/features/pagekite.feature +++ b/functional_tests/features/pagekite.feature @@ -43,7 +43,6 @@ Scenario: Backup and restore pagekite When I configure pagekite with host beforebackup.example.com, port 8081, kite name beforebackup.example.com and kite secret beforebackupsecret And I create a backup of the pagekite app data And I configure pagekite with host afterbackup.example.com, port 8082, kite name afterbackup.example.com and kite secret afterbackupsecret - And I export the pagekite app data backup And I restore the pagekite app data backup Then pagekite should be enabled And pagekite should be configured with host beforebackup.example.com, port 8081, kite name beforebackup.example.com and kite secret beforebackupsecret diff --git a/functional_tests/features/privoxy.feature b/functional_tests/features/privoxy.feature index 174af2c97..44f489f00 100644 --- a/functional_tests/features/privoxy.feature +++ b/functional_tests/features/privoxy.feature @@ -36,6 +36,5 @@ Scenario: Disable privoxy application Scenario: Backup and restore privoxy Given the privoxy application is enabled When I create a backup of the privoxy app data - And I export the privoxy app data backup And I restore the privoxy app data backup Then the privoxy service should be running diff --git a/functional_tests/features/quassel.feature b/functional_tests/features/quassel.feature index 7bf3c70cb..bb535eb50 100644 --- a/functional_tests/features/quassel.feature +++ b/functional_tests/features/quassel.feature @@ -37,6 +37,5 @@ Scenario: Disable quassel application Scenario: Backup and restore quassel Given the quassel application is enabled When I create a backup of the quassel app data - And I export the quassel app data backup And I restore the quassel app data backup Then the quassel service should be running diff --git a/functional_tests/features/repro.feature b/functional_tests/features/repro.feature index a865c1986..5a814a35c 100644 --- a/functional_tests/features/repro.feature +++ b/functional_tests/features/repro.feature @@ -38,6 +38,5 @@ Scenario: Backup and restore repro And repro has been configured When I create a backup of the repro app data And I delete the repro configuration - And I export the repro app data backup And I restore the repro app data backup Then the repro configuration should be restored diff --git a/functional_tests/features/roundcube.feature b/functional_tests/features/roundcube.feature index dc28365ab..1ab267eee 100644 --- a/functional_tests/features/roundcube.feature +++ b/functional_tests/features/roundcube.feature @@ -36,6 +36,5 @@ Scenario: Disable roundcube application Scenario: Backup and restore roundcube Given the roundcube application is enabled When I create a backup of the roundcube app data - And I export the roundcube app data backup And I restore the roundcube app data backup Then the roundcube site should be available diff --git a/functional_tests/features/searx.feature b/functional_tests/features/searx.feature index 50e776038..216fd0bbd 100644 --- a/functional_tests/features/searx.feature +++ b/functional_tests/features/searx.feature @@ -36,6 +36,5 @@ Scenario: Disable searx application Scenario: Backup and restore searx Given the searx application is enabled When I create a backup of the searx app data - And I export the searx app data backup And I restore the searx app data backup Then the searx site should be available diff --git a/functional_tests/features/security.feature b/functional_tests/features/security.feature index e9011266c..ed596bbb0 100644 --- a/functional_tests/features/security.feature +++ b/functional_tests/features/security.feature @@ -36,6 +36,5 @@ Scenario: Backup and restore security When I enable restricted console logins And I create a backup of the security app data And I disable restricted console logins - And I export the security app data backup And I restore the security app data backup Then restricted console logins should be enabled diff --git a/functional_tests/features/shadowsocks.feature b/functional_tests/features/shadowsocks.feature index 25d5ebdcc..d7f99b474 100644 --- a/functional_tests/features/shadowsocks.feature +++ b/functional_tests/features/shadowsocks.feature @@ -39,7 +39,6 @@ Scenario: Backup and restore shadowsocks When I configure shadowsocks with server beforebackup.example.com and password beforebackup123 And I create a backup of the shadowsocks app data And I configure shadowsocks with server afterbackup.example.com and password afterbackup123 - And I export the shadowsocks app data backup And I restore the shadowsocks app data backup Then the shadowsocks service should be running And shadowsocks should be configured with server beforebackup.example.com and password beforebackup123 diff --git a/functional_tests/features/sharing.feature b/functional_tests/features/sharing.feature index b16602fae..ed9b68e57 100644 --- a/functional_tests/features/sharing.feature +++ b/functional_tests/features/sharing.feature @@ -56,7 +56,6 @@ Scenario: Backup and restore sharing When I add a share tmp from path /tmp for admin And I create a backup of the sharing app data And I remove share tmp - And I export the sharing app data backup And I restore the sharing app data backup Then the share tmp should be listed from path /tmp for admin And the share tmp should be accessible diff --git a/functional_tests/features/ssh.feature b/functional_tests/features/ssh.feature index adc191cd4..28c8beb00 100644 --- a/functional_tests/features/ssh.feature +++ b/functional_tests/features/ssh.feature @@ -38,6 +38,5 @@ Scenario: Disable ssh application Scenario: Backup and restore ssh Given the ssh application is enabled When I create a backup of the ssh app data - And I export the ssh app data backup And I restore the ssh app data backup Then the ssh service should be running diff --git a/functional_tests/features/storage_snapshots.feature b/functional_tests/features/storage_snapshots.feature index d5f59937f..f371113e8 100644 --- a/functional_tests/features/storage_snapshots.feature +++ b/functional_tests/features/storage_snapshots.feature @@ -37,6 +37,5 @@ Scenario: Backup and restore snapshot When I configure snapshots with timeline snapshots disabled, software snapshots disabled, hourly limit 10, daily limit 3, weekly limit 2, monthly limit 2, yearly limit 0, delete old software snapshots 15 And I create a backup of the snapshot app data And I configure snapshots with timeline snapshots enabled, software snapshots enabled, hourly limit 3, daily limit 2, weekly limit 1, monthly limit 1, yearly limit 1, delete old software snapshots 2 - And I export the snapshot app data backup And I restore the snapshot app data backup Then snapshots should be configured with timeline snapshots disabled, software snapshots disabled, hourly limit 10, daily limit 3, weekly limit 2, monthly limit 2, yearly limit 0, delete old software snapshots 15 diff --git a/functional_tests/features/transmission.feature b/functional_tests/features/transmission.feature index 69590492f..891110d1c 100644 --- a/functional_tests/features/transmission.feature +++ b/functional_tests/features/transmission.feature @@ -44,7 +44,6 @@ Scenario: Backup and restore transmission When all torrents are removed from transmission And I upload a sample torrent to transmission And I create a backup of the transmission app data - And I export the transmission app data backup And all torrents are removed from transmission And I restore the transmission app data backup Then the transmission service should be running diff --git a/functional_tests/step_definitions/system.py b/functional_tests/step_definitions/system.py index ddca29d27..1f87302f6 100644 --- a/functional_tests/step_definitions/system.py +++ b/functional_tests/step_definitions/system.py @@ -172,11 +172,6 @@ def backup_create(browser, app_name): system.backup_create(browser, app_name) -@when(parsers.parse('I export the {app_name:w} app data backup')) -def backup_export(browser, app_name): - system.backup_export(browser, app_name) - - @when(parsers.parse('I restore the {app_name:w} app data backup')) def backup_restore(browser, app_name): system.backup_restore(browser, app_name) diff --git a/functional_tests/support/system.py b/functional_tests/support/system.py index ba60fd265..d815b4db8 100644 --- a/functional_tests/support/system.py +++ b/functional_tests/support/system.py @@ -202,21 +202,12 @@ def backup_create(browser, app_name): submit(browser) -def backup_export(browser, app_name): - browser.visit(default_url) - nav_to_module(browser, 'backups') - browser.find_link_by_href('/plinth/sys/backups/export/_functional_test_' + - app_name + '/').first.click() - browser.find_by_id('id_backups-disk_0').first.check() - submit(browser) - - def backup_restore(browser, app_name): browser.visit(default_url) nav_to_module(browser, 'backups') browser.find_link_by_href( - '/plinth/sys/backups/restore/%252F/_functional_test_' + app_name + - '.tar.gz/').first.click() + '/plinth/sys/backups/restore-archive/%252F/_functional_test_' + + app_name + '/').first.click() submit(browser)