From b3fd24ce6fb113f615f4ed2b384ba41882e22f04 Mon Sep 17 00:00:00 2001 From: Joseph Nuthalapati Date: Thu, 6 Feb 2020 20:20:04 +0530 Subject: [PATCH] functional-tests: Move @backups to Scenario level Signed-off-by: Joseph Nuthalapati [sunil: Fix marks for quassel app] Signed-off-by: Sunil Mohan Adapa Reviewed-by: Sunil Mohan Adapa --- functional_tests/features/bind.feature | 3 ++- functional_tests/features/date_and_time.feature | 3 ++- functional_tests/features/deluge.feature | 3 ++- functional_tests/features/dynamicdns.feature | 3 ++- functional_tests/features/ejabberd.feature | 3 ++- functional_tests/features/gitweb.feature | 3 ++- functional_tests/features/ikiwiki.feature | 3 ++- functional_tests/features/jsxc.feature | 3 ++- functional_tests/features/mediawiki.feature | 3 ++- functional_tests/features/mldonkey.feature | 3 ++- functional_tests/features/monkeysphere.feature | 3 ++- functional_tests/features/mumble.feature | 3 ++- functional_tests/features/openvpn.feature | 3 ++- functional_tests/features/pagekite.feature | 3 ++- functional_tests/features/privoxy.feature | 3 ++- functional_tests/features/quassel.feature | 3 ++- functional_tests/features/roundcube.feature | 3 ++- functional_tests/features/samba.feature | 3 ++- functional_tests/features/searx.feature | 3 ++- functional_tests/features/shadowsocks.feature | 3 ++- functional_tests/features/sharing.feature | 3 ++- functional_tests/features/ssh.feature | 3 ++- functional_tests/features/storage_snapshots.feature | 3 ++- functional_tests/features/syncthing.feature | 3 ++- functional_tests/features/tahoe.feature | 3 ++- functional_tests/features/tor.feature | 3 ++- functional_tests/features/transmission.feature | 3 ++- functional_tests/features/ttrss.feature | 3 ++- functional_tests/features/upgrades.feature | 3 ++- 29 files changed, 58 insertions(+), 29 deletions(-) diff --git a/functional_tests/features/bind.feature b/functional_tests/features/bind.feature index 3fd02d314..f0bac0d46 100644 --- a/functional_tests/features/bind.feature +++ b/functional_tests/features/bind.feature @@ -1,6 +1,6 @@ # SPDX-License-Identifier: AGPL-3.0-or-later -@apps @bind @backups +@apps @bind Feature: Bind Domain Name Server Configure the Bind Domain Name Server. @@ -31,6 +31,7 @@ Scenario: Disable bind DNSSEC When I disable bind DNSSEC Then bind DNSSEC should be disabled +@backups Scenario: Backup and restore bind Given the bind application is enabled When I set bind forwarders to 1.1.1.1 diff --git a/functional_tests/features/date_and_time.feature b/functional_tests/features/date_and_time.feature index fa8e9d39f..e36b75f5e 100644 --- a/functional_tests/features/date_and_time.feature +++ b/functional_tests/features/date_and_time.feature @@ -1,6 +1,6 @@ # SPDX-License-Identifier: AGPL-3.0-or-later -@essential @date_and_time @system @backups +@essential @date_and_time @system Feature: Date and Time Configure time zone and network time service. @@ -23,6 +23,7 @@ Scenario: Set timezone When I set the time zone to Africa/Abidjan Then the time zone should be Africa/Abidjan +@backups Scenario: Backup and restore datetime When I set the time zone to Africa/Accra And I create a backup of the datetime app data with name test_datetime diff --git a/functional_tests/features/deluge.feature b/functional_tests/features/deluge.feature index 2da871917..419a9a45c 100644 --- a/functional_tests/features/deluge.feature +++ b/functional_tests/features/deluge.feature @@ -1,6 +1,6 @@ # SPDX-License-Identifier: AGPL-3.0-or-later -@apps @deluge @backups +@apps @deluge Feature: Deluge BitTorrent Client Run the Deluge BitTorrent client. @@ -19,6 +19,7 @@ Scenario: Upload a torrent to deluge And I upload a sample torrent to deluge Then there should be 1 torrents listed in deluge +@backups Scenario: Backup and restore deluge Given the deluge application is enabled When all torrents are removed from deluge diff --git a/functional_tests/features/dynamicdns.feature b/functional_tests/features/dynamicdns.feature index 57023cf0e..011cdbdc6 100644 --- a/functional_tests/features/dynamicdns.feature +++ b/functional_tests/features/dynamicdns.feature @@ -1,6 +1,6 @@ # SPDX-License-Identifier: AGPL-3.0-or-later -@apps @dynamicdns @backups +@apps @dynamicdns Feature: Dynamic DNS Client Update public IP to a GnuDIP server. @@ -8,6 +8,7 @@ Background: Given I'm a logged in user And the dynamicdns application is installed +@backups Scenario: Backup and restore configuration Given dynamicdns is configured When I create a backup of the dynamicdns app data with name test_dynamicdns diff --git a/functional_tests/features/ejabberd.feature b/functional_tests/features/ejabberd.feature index f57d2c63d..774e768cc 100644 --- a/functional_tests/features/ejabberd.feature +++ b/functional_tests/features/ejabberd.feature @@ -1,6 +1,6 @@ # SPDX-License-Identifier: AGPL-3.0-or-later -@apps @ejabberd @backups +@apps @ejabberd Feature: Ejabberd Chat Server Run ejabberd chat server. @@ -23,6 +23,7 @@ Scenario: Disable message archive management When I disable message archive management Then the ejabberd service should be running +@backups Scenario: Backup and restore ejabberd Given the ejabberd application is enabled And I have added a contact to my roster diff --git a/functional_tests/features/gitweb.feature b/functional_tests/features/gitweb.feature index d509199e2..3719632a4 100644 --- a/functional_tests/features/gitweb.feature +++ b/functional_tests/features/gitweb.feature @@ -1,6 +1,6 @@ # SPDX-License-Identifier: AGPL-3.0-or-later -@apps @gitweb @backups @sso +@apps @gitweb @sso Feature: gitweb Simple Git Hosting Git web interface. @@ -33,6 +33,7 @@ Scenario: Delete repository When I delete the repository Then the repository should not be listed +@backups Scenario: Backup and restore gitweb Given the gitweb application is enabled And a repository diff --git a/functional_tests/features/ikiwiki.feature b/functional_tests/features/ikiwiki.feature index f25a0dae3..7b6ab085b 100644 --- a/functional_tests/features/ikiwiki.feature +++ b/functional_tests/features/ikiwiki.feature @@ -1,6 +1,6 @@ # SPDX-License-Identifier: AGPL-3.0-or-later -@apps @ikiwiki @backups +@apps @ikiwiki Feature: ikiwiki Wiki and Blog Manage wikis and blogs. @@ -13,6 +13,7 @@ Scenario: Enable wiki application When I enable the wiki application Then the wiki site should be available +@backups Scenario: Backup and restore wiki Given the wiki application is enabled When there is an ikiwiki wiki diff --git a/functional_tests/features/jsxc.feature b/functional_tests/features/jsxc.feature index 677a1d033..f39577bd9 100644 --- a/functional_tests/features/jsxc.feature +++ b/functional_tests/features/jsxc.feature @@ -1,6 +1,6 @@ # SPDX-License-Identifier: AGPL-3.0-or-later -@apps @jsxc @backups +@apps @jsxc Feature: JSXC XMPP Client Run the JSXC XMPP client. @@ -11,6 +11,7 @@ Scenario: Install jsxc application Given the jsxc application is installed Then the jsxc site should be available +@backups Scenario: Backup and restore jsxc Given the jsxc application is installed When I create a backup of the jsxc app data with name test_jsxc diff --git a/functional_tests/features/mediawiki.feature b/functional_tests/features/mediawiki.feature index e3b0de90f..fd48e1297 100644 --- a/functional_tests/features/mediawiki.feature +++ b/functional_tests/features/mediawiki.feature @@ -1,6 +1,6 @@ # SPDX-License-Identifier: AGPL-3.0-or-later -@apps @mediawiki @backups +@apps @mediawiki Feature: MediaWiki Wiki Engine Manage wikis, multimedia and more. @@ -63,6 +63,7 @@ Scenario: Upload SVG image When I upload an image named apps-background.svg to mediawiki with credentials admin and whatever123 Then there should be Apps-background.svg image +@backups Scenario: Backup and restore mediawiki Given the mediawiki application is enabled When I create a backup of the mediawiki app data with name test_mediawiki diff --git a/functional_tests/features/mldonkey.feature b/functional_tests/features/mldonkey.feature index 188366c0d..ea4f95b13 100644 --- a/functional_tests/features/mldonkey.feature +++ b/functional_tests/features/mldonkey.feature @@ -1,6 +1,6 @@ # SPDX-License-Identifier: AGPL-3.0-or-later -@apps @mldonkey @backups @sso +@apps @mldonkey @sso Feature: MLDonkey eDonkey Network Client Run the eDonkey Network client. @@ -20,6 +20,7 @@ Scenario: Upload an ed2k file to mldonkey And I upload a sample ed2k file to mldonkey Then there should be 1 ed2k files listed in mldonkey +@backups Scenario: Backup and restore mldonkey Given the mldonkey application is enabled When all ed2k files are removed from mldonkey diff --git a/functional_tests/features/monkeysphere.feature b/functional_tests/features/monkeysphere.feature index be30b4b45..05d70a5b3 100644 --- a/functional_tests/features/monkeysphere.feature +++ b/functional_tests/features/monkeysphere.feature @@ -1,6 +1,6 @@ # SPDX-License-Identifier: AGPL-3.0-or-later -@apps @monkeysphere @backups +@apps @monkeysphere Feature: Monkeysphere Import and publish OpenPGP keys for SSH and HTTPS keys @@ -26,6 +26,7 @@ Scenario: Publish HTTPS keys Given the HTTPS key for mydomain.example is imported in monkeysphere Then I should be able to publish HTTPS key for mydomain.example in monkeysphere +@backups Scenario: Backup and restore monkeysphere When I import SSH key for mydomain.example in monkeysphere And I import HTTPS key for mydomain.example in monkeysphere diff --git a/functional_tests/features/mumble.feature b/functional_tests/features/mumble.feature index 1218201f7..d5b01664e 100644 --- a/functional_tests/features/mumble.feature +++ b/functional_tests/features/mumble.feature @@ -1,6 +1,6 @@ # SPDX-License-Identifier: AGPL-3.0-or-later -@apps @mumble @backups +@apps @mumble Feature: Mumble Voice Chat Run Mumble voice chat server. @@ -15,6 +15,7 @@ Scenario: Enable mumble application # TODO: Improve this to actually check that data such as rooms, identity or # certificates are restored. +@backups Scenario: Backup and restore mumble Given the mumble application is enabled When I create a backup of the mumble app data with name test_mumble diff --git a/functional_tests/features/openvpn.feature b/functional_tests/features/openvpn.feature index 5ebe53e70..3e7ff9e23 100644 --- a/functional_tests/features/openvpn.feature +++ b/functional_tests/features/openvpn.feature @@ -1,6 +1,6 @@ # SPDX-License-Identifier: AGPL-3.0-or-later -@apps @openvpn @backups +@apps @openvpn Feature: OpenVPN - Virtual Private Network Setup and configure OpenVPN @@ -18,6 +18,7 @@ Scenario: Download openvpn profile Given the openvpn application is enabled Then the openvpn profile should be downloadable +@backups Scenario: Backup and restore openvpn Given the openvpn application is enabled And I download openvpn profile diff --git a/functional_tests/features/pagekite.feature b/functional_tests/features/pagekite.feature index 1b6e32862..5d8afcb3b 100644 --- a/functional_tests/features/pagekite.feature +++ b/functional_tests/features/pagekite.feature @@ -1,6 +1,6 @@ # SPDX-License-Identifier: AGPL-3.0-or-later -@apps @pagekite @backups +@apps @pagekite Feature: Pagekite Public Visibility Configure Pagekite public visitbility server. @@ -18,6 +18,7 @@ Scenario: Configure pagekite application When I configure pagekite with host pagekite.example.com, port 8080, kite name mykite.example.com and kite secret mysecret Then pagekite should be configured with host pagekite.example.com, port 8080, kite name mykite.example.com and kite secret mysecret +@backups Scenario: Backup and restore pagekite Given the pagekite application is enabled When I configure pagekite 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 66a1f133a..ff397339d 100644 --- a/functional_tests/features/privoxy.feature +++ b/functional_tests/features/privoxy.feature @@ -1,6 +1,6 @@ # SPDX-License-Identifier: AGPL-3.0-or-later -@apps @privoxy @backups +@apps @privoxy Feature: Privoxy Web Proxy Proxy web connections for enhanced privacy. @@ -13,6 +13,7 @@ Scenario: Enable privoxy application When I enable the privoxy application Then the privoxy service should be running +@backups Scenario: Backup and restore privoxy Given the privoxy application is enabled When I create a backup of the privoxy app data with name test_privoxy diff --git a/functional_tests/features/quassel.feature b/functional_tests/features/quassel.feature index 89a64b30b..2012ed0cc 100644 --- a/functional_tests/features/quassel.feature +++ b/functional_tests/features/quassel.feature @@ -1,6 +1,6 @@ # SPDX-License-Identifier: AGPL-3.0-or-later -@apps @quassel @backups +@apps @quassel Feature: Quassel IRC Client Run Quassel core. @@ -14,6 +14,7 @@ Scenario: Enable quassel application Then the quassel service should be running # TODO: Improve this to actually check that data configured servers is restored. +@backups Scenario: Backup and restore quassel Given the quassel application is enabled When I create a backup of the quassel app data with name test_quassel diff --git a/functional_tests/features/roundcube.feature b/functional_tests/features/roundcube.feature index ee8ce3f27..0baa92055 100644 --- a/functional_tests/features/roundcube.feature +++ b/functional_tests/features/roundcube.feature @@ -1,6 +1,6 @@ # SPDX-License-Identifier: AGPL-3.0-or-later -@apps @roundcube @backups +@apps @roundcube Feature: Roundcube Email Client Run webmail client. @@ -13,6 +13,7 @@ Scenario: Enable roundcube application When I enable the roundcube application Then the roundcube site should be available +@backups Scenario: Backup and restore roundcube Given the roundcube application is enabled When I create a backup of the roundcube app data with name test_roundcube diff --git a/functional_tests/features/samba.feature b/functional_tests/features/samba.feature index c8936254d..3f5764fde 100644 --- a/functional_tests/features/samba.feature +++ b/functional_tests/features/samba.feature @@ -1,6 +1,6 @@ # SPDX-License-Identifier: AGPL-3.0-or-later -@apps @samba @backups +@apps @samba Feature: Samba File Sharing Configure samba file sharing service. @@ -37,6 +37,7 @@ Scenario: Disable open samba share When I disable the open samba share Then the open samba share should not be available +@backups Scenario: Backup and restore samba Given the samba application is enabled When I enable the home samba share diff --git a/functional_tests/features/searx.feature b/functional_tests/features/searx.feature index e0ca2db14..66b01baa4 100644 --- a/functional_tests/features/searx.feature +++ b/functional_tests/features/searx.feature @@ -1,6 +1,6 @@ # SPDX-License-Identifier: AGPL-3.0-or-later -@apps @searx @backups @sso +@apps @searx @sso Feature: Searx Web Search Run Searx metasearch engine. @@ -13,6 +13,7 @@ Scenario: Enable searx application When I enable the searx application Then the searx site should be available +@backups Scenario: Backup and restore searx Given the searx application is enabled When I create a backup of the searx app data with name test_searx diff --git a/functional_tests/features/shadowsocks.feature b/functional_tests/features/shadowsocks.feature index 866b077c0..67167e004 100644 --- a/functional_tests/features/shadowsocks.feature +++ b/functional_tests/features/shadowsocks.feature @@ -1,6 +1,6 @@ # SPDX-License-Identifier: AGPL-3.0-or-later -@apps @shadowsocks @backups +@apps @shadowsocks Feature: Shadowsocks Socks5 Proxy Run the Shadowsocks Socks5 proxy client. @@ -14,6 +14,7 @@ Scenario: Enable shadowsocks application When I enable the shadowsocks application Then the shadowsocks service should be running +@backups Scenario: Backup and restore shadowsocks Given the shadowsocks application is enabled When I configure shadowsocks with server example.com and password beforebackup123 diff --git a/functional_tests/features/sharing.feature b/functional_tests/features/sharing.feature index b77669dc3..3d3c16765 100644 --- a/functional_tests/features/sharing.feature +++ b/functional_tests/features/sharing.feature @@ -1,6 +1,6 @@ # SPDX-License-Identifier: AGPL-3.0-or-later -@apps @sharing @backups +@apps @sharing Feature: Sharing Share server folders over HTTP, etc. @@ -41,6 +41,7 @@ Scenario: Public share And I log out Then the share_tmp site should be available +@backups Scenario: Backup and restore sharing Given share tmp is not available When I add a share tmp from path /tmp for admin diff --git a/functional_tests/features/ssh.feature b/functional_tests/features/ssh.feature index e8a169508..251125044 100644 --- a/functional_tests/features/ssh.feature +++ b/functional_tests/features/ssh.feature @@ -1,6 +1,6 @@ # SPDX-License-Identifier: AGPL-3.0-or-later -@apps @ssh @backups +@apps @ssh Feature: Secure Shell Server Run secure shell server. @@ -20,6 +20,7 @@ Scenario: Disable ssh application # TODO: Improve this to actually check that earlier ssh certificate has been # restored. +@backups Scenario: Backup and restore ssh Given the ssh application is enabled When I create a backup of the ssh app data with name test_ssh diff --git a/functional_tests/features/storage_snapshots.feature b/functional_tests/features/storage_snapshots.feature index 8899499ad..542d9d90e 100644 --- a/functional_tests/features/storage_snapshots.feature +++ b/functional_tests/features/storage_snapshots.feature @@ -1,6 +1,6 @@ # SPDX-License-Identifier: AGPL-3.0-or-later -@system @snapshot @backups +@system @snapshot Feature: Storage Snapshots Run storage snapshots application - Snapper. @@ -18,6 +18,7 @@ Scenario: Configure snapshots When I configure snapshots with free space 20, timeline snapshots enabled, software snapshots enabled, hourly limit 3, daily limit 2, weekly limit 1, monthly limit 1, yearly limit 1 Then snapshots should be configured with free space 20, timeline snapshots enabled, software snapshots enabled, hourly limit 3, daily limit 2, weekly limit 1, monthly limit 1, yearly limit 1 +@backups Scenario: Backup and restore snapshot When I configure snapshots with free space 30, timeline snapshots disabled, software snapshots disabled, hourly limit 10, daily limit 3, weekly limit 2, monthly limit 2, yearly limit 0 And I create a backup of the snapshot app data with name test_storage_snapshots diff --git a/functional_tests/features/syncthing.feature b/functional_tests/features/syncthing.feature index 84360256f..a397eacac 100644 --- a/functional_tests/features/syncthing.feature +++ b/functional_tests/features/syncthing.feature @@ -1,6 +1,6 @@ # SPDX-License-Identifier: AGPL-3.0-or-later -@apps @syncthing @sso @backups +@apps @syncthing @sso Feature: Syncthing File Synchronization Run Syncthing File Synchronization server. @@ -25,6 +25,7 @@ Scenario: Remove a syncthing folder When I remove syncthing folder Test Then syncthing folder Test should not be present +@backups Scenario: Backup and restore syncthing Given the syncthing application is enabled And syncthing folder Test is not present diff --git a/functional_tests/features/tahoe.feature b/functional_tests/features/tahoe.feature index ad12c10b7..8dcf9ca27 100644 --- a/functional_tests/features/tahoe.feature +++ b/functional_tests/features/tahoe.feature @@ -4,7 +4,7 @@ # /var/lib/tahoe-lafs and failes to start in the next run. Enable tests after # this is fixed. -@apps @tahoe @backups @skip +@apps @tahoe @skip Feature: Tahoe-LAFS distribute file storage Run the Tahoe distribute file storage server @@ -37,6 +37,7 @@ Scenario: Remove tahoe introducer When I remove anotherdomain.example as a tahoe introducer Then anotherdomain.example should not be a tahoe connected introducer +@backups Scenario: Backup and restore tahoe Given the tahoe application is enabled And backupdomain.example is a tahoe introducer diff --git a/functional_tests/features/tor.feature b/functional_tests/features/tor.feature index 80513816e..ed2dad8b2 100644 --- a/functional_tests/features/tor.feature +++ b/functional_tests/features/tor.feature @@ -1,6 +1,6 @@ # SPDX-License-Identifier: AGPL-3.0-or-later -@apps @tor @backups +@apps @tor Feature: Tor Anonymity Network Manage Tor configuration. @@ -39,6 +39,7 @@ Scenario: Set download software packages over tor # TODO: Test more thoroughly by checking same hidden service is restored and by # actually connecting using Tor. +@backups Scenario: Backup and restore tor Given the tor application is enabled And tor relay is enabled diff --git a/functional_tests/features/transmission.feature b/functional_tests/features/transmission.feature index 1b992c411..bec006c7b 100644 --- a/functional_tests/features/transmission.feature +++ b/functional_tests/features/transmission.feature @@ -1,6 +1,6 @@ # SPDX-License-Identifier: AGPL-3.0-or-later -@apps @transmission @backups @sso +@apps @transmission @sso Feature: Transmission BitTorrent Client Run the Transmission BitTorrent client. @@ -19,6 +19,7 @@ Scenario: Upload a torrent to transmission And I upload a sample torrent to transmission Then there should be 1 torrents listed in transmission +@backups Scenario: Backup and restore transmission Given the transmission application is enabled When all torrents are removed from transmission diff --git a/functional_tests/features/ttrss.feature b/functional_tests/features/ttrss.feature index d208e4f2a..b1efdfa80 100644 --- a/functional_tests/features/ttrss.feature +++ b/functional_tests/features/ttrss.feature @@ -1,6 +1,6 @@ # SPDX-License-Identifier: AGPL-3.0-or-later -@apps @ttrss @sso @backups +@apps @ttrss @sso Feature: TT-RSS News Feed Reader Run TT-RSS News Feed Reader. @@ -13,6 +13,7 @@ Scenario: Enable ttrss application When I enable the ttrss application Then the ttrss service should be running +@backups Scenario: Backup and restore ttrss Given the ttrss application is enabled And I subscribe to a feed in ttrss diff --git a/functional_tests/features/upgrades.feature b/functional_tests/features/upgrades.feature index a196c4ea6..e828c7afc 100644 --- a/functional_tests/features/upgrades.feature +++ b/functional_tests/features/upgrades.feature @@ -1,6 +1,6 @@ # SPDX-License-Identifier: AGPL-3.0-or-later -@essential @upgrades @system @backups +@essential @upgrades @system Feature: Software Upgrades Configure automatic software upgrades @@ -12,6 +12,7 @@ Scenario: Enable automatic upgrades When I enable automatic upgrades Then automatic upgrades should be enabled +@backups Scenario: Backup and restore upgrades When I enable automatic upgrades And I create a backup of the upgrades app data with name test_upgrades