test: add missing sync_blocks to dynafed test; disable timing out t…

…ravis test
ElementsProject · Apr 1, 2021 · 24ca09c · 24ca09c
1 parent f76fe5e
commit 24ca09c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -65,10 +65,11 @@ jobs:
       script:
         - set -o errexit; source ./ci/lint/06_script.sh
 
-    - stage: test
-      name: '32-bit + dash  [GOAL: install]  [CentOS 7]  [gui]'
-      env: >-
-        FILE_ENV="./ci/test/00_setup_env_i686_centos.sh"
+# Disabled due to new Travis restrictions; will be removed as part of 0.22 rebase
+#    - stage: test
+#      name: '32-bit + dash  [GOAL: install]  [CentOS 7]  [gui]'
+#      env: >-
+#        FILE_ENV="./ci/test/00_setup_env_i686_centos.sh"
 
     - stage: test
       name: 'x86_64 Linux  [GOAL: install]  [xenial]  [no wallet]'

diff --git a/test/functional/feature_dynafed.py b/test/functional/feature_dynafed.py
@@ -500,6 +500,7 @@ def test_valid_epochs(self):
             self.assert_accepted(pegin_tx)
             self.assert_accepted(pegout_tx)
         assert_equal(self.nodes[0].getsidechaininfo()["current_fedpegscripts"], ["51", "51"])
+        self.sync_blocks()
 
         # Now have node 1 transition to new pak and fedpegscript
         pak_prop["fedpegscript"] = "52"