File tree 4 files changed +8
-18
lines changed 4 files changed +8
-18
lines changed Original file line number Diff line number Diff line change @@ -114,12 +114,9 @@ install: $(DIST_TEST) po/LINGUAS
114
114
cp webui-desktop $(DESTDIR ) /usr/libexec/
115
115
ln -sTfr $(DESTDIR ) /usr/share/pixmaps/fedora-logo-sprite.svg $(DESTDIR ) /usr/share/cockpit/$(PACKAGE_NAME ) /logo.svg
116
116
117
- # required for running integration tests; commander and ws are deps of chrome-remote-interface
117
+ # required for running integration tests;
118
118
TEST_NPMS = \
119
- node_modules/chrome-remote-interface \
120
- node_modules/commander \
121
119
node_modules/sizzle \
122
- node_modules/ws \
123
120
$(NULL )
124
121
125
122
dist : $(TARFILE )
@@ -155,7 +152,7 @@ COCKPIT_REPO_FILES = \
155
152
$(NULL )
156
153
157
154
COCKPIT_REPO_URL = https://github.com/cockpit-project/cockpit.git
158
- COCKPIT_REPO_COMMIT = 07fddba43934fb256ec8da03812f081eab3baa18 # 321 + 117 commits
155
+ COCKPIT_REPO_COMMIT = 8ede522e5066e680850dd2ae049e2e24f99c4230 # 322 + 30 commits
159
156
160
157
$(COCKPIT_REPO_FILES ) : $(COCKPIT_REPO_STAMP )
161
158
COCKPIT_REPO_TREE = '$(strip $(COCKPIT_REPO_COMMIT ) ) ^{tree}'
Original file line number Diff line number Diff line change 14
14
"stylelint:fix" : " stylelint --fix 'src/**/*{.css,scss}'"
15
15
},
16
16
"devDependencies" : {
17
- "chrome-remote-interface" : " 0.33.2" ,
18
17
"esbuild" : " 0.23.0" ,
19
18
"esbuild-plugin-copy" : " 2.1.1" ,
20
19
"esbuild-plugin-replace" : " 1.4.0" ,
32
31
"eslint-plugin-simple-import-sort" : " ^12.0.0" ,
33
32
"eslint-plugin-sort-destructure-keys" : " ^2.0.0" ,
34
33
"gettext-parser" : " 8.0.0" ,
34
+ "glob" : " 11.0.0" ,
35
35
"htmlparser" : " 1.7.7" ,
36
36
"jed" : " 1.1.1" ,
37
37
"qunit" : " 2.21.1" ,
Original file line number Diff line number Diff line change 15
15
# You should have received a copy of the GNU Lesser General Public License
16
16
# along with this program; If not, see <http://www.gnu.org/licenses/>.
17
17
18
- import time
19
-
20
18
from anacondalib import VirtInstallMachineCase
21
19
from installer import Installer
22
20
from language import Language
@@ -249,12 +247,8 @@ class TestBasic(VirtInstallMachineCase):
249
247
250
248
b .wait_not_present ("#critical-error-bz-report-modal.pf-v5-c-modal-box" )
251
249
252
- with self .assertRaises (RuntimeError ):
253
- b .eval_js ("window.setTimeout(function() { myNonExistingFunction()}, 0);" )
254
- # Some round trips, one of which should update the deferred exception
255
- for _ in range (0 , 5 ):
256
- b .wait_in_text ("#critical-error-bz-report-modal-details" , "myNonExistingFunction is not defined" )
257
- time .sleep (2 )
250
+ b .eval_js ("window.setTimeout(function() { myNonExistingFunction()}, 0);" )
251
+ b .wait_in_text ("#critical-error-bz-report-modal-details" , "myNonExistingFunction is not defined" )
258
252
259
253
b .wait_visible ("a:contains('Report issue'):not([disabled])" )
260
254
b .assert_pixels (
Original file line number Diff line number Diff line change @@ -196,10 +196,9 @@ class TestStorage(VirtInstallMachineCase, StorageHelpers):
196
196
197
197
b .wait_not_present ("#critical-error-bz-report-modal.pf-v5-c-modal-box" )
198
198
199
- with self .assertRaises (RuntimeError ):
200
- b .eval_js ("window.setTimeout(function() {throw new Error('Unexpected storage JS error')}, 0);" )
201
- b .wait_in_text ("#critical-error-bz-report-modal-details" , "Unexpected storage JS error" )
202
- b .wait_in_text ("#critical-error-bz-report-modal header" , "The installer cannot continue due to a critical error: Storage plugin failed" )
199
+ b .eval_js ("window.setTimeout(function() {throw new Error('Unexpected storage JS error')}, 0);" )
200
+ b .wait_in_text ("#critical-error-bz-report-modal-details" , "Unexpected storage JS error" )
201
+ b .wait_in_text ("#critical-error-bz-report-modal header" , "The installer cannot continue due to a critical error: Storage plugin failed" )
203
202
204
203
@nondestructive
205
204
class TestMultipleDisks (VirtInstallMachineCase , StorageHelpers ):
You can’t perform that action at this time.
0 commit comments