Skip to content

Commit 4fa6beb

Browse files
committed
tries fixing github workflow build
1 parent bdf3a46 commit 4fa6beb

3 files changed

Lines changed: 27 additions & 25 deletions

File tree

tests/test_Selector.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ def testIssue25(self):
3131
The core components of the selector are define by https://github.com/WolfgangFahl/py-3rdparty-mediawiki/issues/25
3232
Add Selection option for multi-file operations #25
3333
'''
34-
# don't test this in Travis since it's interactive
35-
if getpass.getuser() == "travis":
34+
# don't test this in Travis or github actions since it's interactive
35+
if getpass.getuser() in [ "travis", "runner" ]:
3636
return
3737

3838
# switch of interactive tests by default

tests/test_WikiPush.py

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,12 @@ def setUp(self):
1919
self.debug=False
2020
pass
2121

22+
def inPublicCI(self):
23+
'''
24+
are we running in a public Continuous Integration Environment?
25+
'''
26+
return getpass.getuser() in [ "travis", "runner" ];
27+
2228

2329
def tearDown(self):
2430
pass
@@ -28,8 +34,7 @@ def testIssue11(self):
2834
test the limit handling
2935
'''
3036
# don't test this in Travis
31-
if getpass.getuser()=="travis":
32-
return
37+
if self.inPublicCI(): return
3338
askQuery="[[isA::Event]]"
3439
wikipush=WikiPush("or",None)
3540
pages=wikipush.query(askQuery,showProgress=False,limit=10)
@@ -40,8 +45,7 @@ def testIssue29(self):
4045
makes sure query does not hang on large queries
4146
'''
4247
# don't test this in Travis
43-
if getpass.getuser()=="travis":
44-
return
48+
if self.inPublicCI(): return
4549
return # test takes 22 secs - don't activate if not necessary
4650
askQuery="[[isA::Event]]"
4751
wikipush=WikiPush("orcopy",None)
@@ -55,8 +59,7 @@ def testIssue16(self):
5559
allow mass delete of pages
5660
'''
5761
# don't test this in Travis
58-
if getpass.getuser()=="travis":
59-
return
62+
if self.inPublicCI(): return
6063
wikipush=WikiPush(None,"test")
6164
pageTitles=['deleteMe1','deleteMe2','deleteMe3']
6265
for pageTitle in pageTitles:
@@ -72,8 +75,7 @@ def testIssue14(self):
7275
'''
7376
return # don't test this nightly
7477
# don't test this in Travis
75-
if getpass.getuser()=="travis":
76-
return
78+
if self.inPublicCI(): return
7779
wikipush=WikiPush("master","test")
7880
wikipush.push(["File:index.png"], force=True, ignore=True, withImages=True)
7981

@@ -84,8 +86,7 @@ def testIssue12(self):
8486
add -qf / queryField option to allow to select other property than mainlabel
8587
'''
8688
# don't test this in Travis
87-
if getpass.getuser()=="travis":
88-
return
89+
if self.inPublicCI(): return
8990
wikipush=WikiPush("smwcopy","test")
9091
ask="""{{#ask:[[Has conference::+]]
9192
|mainlabel=Talk
@@ -108,8 +109,7 @@ def testTransferPagesFromMaster(self):
108109
'''
109110
test transferpages
110111
'''
111-
if getpass.getuser()=="travis":
112-
return
112+
if self.inPublicCI(): return
113113
ask="{{#ask: [[TransferPage page::+]][[TransferPage wiki::Master]]| mainlabel=-| ?TransferPage page = page| format=table|limit=300}}"
114114
wikipush=WikiPush("master","test")
115115
pages=wikipush.query(ask,queryField="page")
@@ -121,8 +121,7 @@ def testQuery(self):
121121
https://github.com/WolfgangFahl/py-3rdparty-mediawiki/issues/10
122122
Query support for page selection
123123
'''
124-
if getpass.getuser()=="travis":
125-
return
124+
if self.inPublicCI(): return
126125
wp=WikiPush("smwcopy","test")
127126
pages=wp.query("[[Capital of::+]]")
128127
if self.debug:
@@ -132,8 +131,7 @@ def testQuery(self):
132131

133132
def testWikiBackup(self):
134133
# don't test this in Travis
135-
if getpass.getuser()=="travis":
136-
return
134+
if self.inPublicCI(): return
137135
wp=WikiPush("smw")
138136
pageTitles=wp.query("[[Capital of::+]]")
139137
wp.backup(pageTitles)
@@ -151,8 +149,7 @@ def testWikiPush(self):
151149
test pushing a page from one wiki to another
152150
'''
153151
# don't test this in Travis
154-
if getpass.getuser()=="travis":
155-
return
152+
if self.inPublicCI(): return
156153
wp=WikiPush("wikipedia_org_test2","test")
157154
for force in [False,True]:
158155
for ignore in [False,True]:
@@ -177,8 +174,7 @@ def testDownload(self):
177174
check the image download
178175
'''
179176
# don't test this in Travis
180-
if getpass.getuser()=="travis":
181-
return
177+
if self.inPublicCI(): return
182178
wp=WikiPush("wikipedia_org_test2","test")
183179
page=wp.fromWiki.getPage("PictureTestPage")
184180
images=list(page.images())

tests/test_WikiUser.py

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,19 @@ def setUp(self):
2222

2323
def tearDown(self):
2424
pass
25+
26+
@staticmethod
27+
def inPublicCI():
28+
'''
29+
are we running in a public Continuous Integration Environment?
30+
'''
31+
return getpass.getuser() in [ "travis", "runner" ];
2532

2633
def testWikiUser(self):
2734
'''
2835
test the wiki user handling
2936
'''
30-
if getpass.getuser()=="travis":
31-
return
37+
if TestWikiUser.inPublicCI(): return
3238
wikiUsers=WikiUser.getWikiUsers()
3339
for wikiUser in wikiUsers.values():
3440
if self.debug:
@@ -59,7 +65,7 @@ def getSMW_WikiUser(wikiId="smw"):
5965
raise Exception("%s missing for wikiId %s" % (iniFile,wikiId))
6066
else:
6167
wikiUser=WikiUser.ofDict(wikiDict, lenient=True)
62-
if getpass.getuser()=="travis":
68+
if TestWikiUser.inPublicCI():
6369
wikiUser.save()
6470
else:
6571
wikiUser=WikiUser.ofWikiId(wikiId,lenient=True)

0 commit comments

Comments
 (0)