Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Baseline should be update to not depend anymore on smalltalk/Unicode #56

Merged
merged 3 commits into from
Apr 6, 2020
Merged

Baseline should be update to not depend anymore on smalltalk/Unicode #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f06defe
Load Unicode from github repository (was SmalltalkHub).
akgrant43 Apr 4, 2020
1a5c026
OSFileBasedUnixSubprocessTest fixes
akgrant43 Apr 5, 2020
02a5dfe
Experiment: modify .travis.yml travis_wait
akgrant43 Apr 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 1 addition & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,4 @@ before_script:
- mkdir -p $SMALLTALK_CI_BUILD/UCD && cp UCD/* $SMALLTALK_CI_BUILD/UCD/

script:
- travis_wait 120 sleep infinity &
- $SMALLTALK_CI_HOME/run.sh ${CI_FILE}
- travis_wait 60 $SMALLTALK_CI_HOME/run.sh ${CI_FILE}
15 changes: 6 additions & 9 deletions repository/BaselineOfOSSubprocess.package/BaselineOfOSSubprocess.class/instance/baseline..st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,13 @@ baseline: spec
package: 'OSSubprocess' with: [ spec requires: 'FFICHeaderExtractor' ];
package: 'OSSubprocess-Tests-Unit' with: [ spec requires: #('OSSubprocess' 'Unicode') ];
package: 'OSSubprocess-Tests-Stress' with: [ spec requires: 'OSSubprocess-Tests-Unit' ].

spec baseline: 'FFICHeaderExtractor' with: [
spec repository: 'github://marianopeck/FFICHeaderExtractor:master/repository' ].

spec project: 'Unicode' with: [
spec
className: #ConfigurationOfUnicode;
versionString: #'stable';
repository: 'http://smalltalkhub.com/mc/Pharo/Unicode/main/' ].

spec repository: 'github://marianopeck/FFICHeaderExtractor/repository' ].

spec baseline: 'Unicode' with: [
spec repository: 'github://pharo-contributions/pharo-unicode/repository' ].

spec
group: 'Core' with: #( 'OSSubprocess' );
group: 'Tests' with: #( 'OSSubprocess-Tests-Unit' 'OSSubprocess-Tests-Stress' ).
Expand Down
11 changes: 5 additions & 6 deletions ...nit.package/OSSFileBasedUnixSubprocessTest.class/instance/getStreamsInfoForRunningTest.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
helpers
getStreamsInfoForRunningTest
"We obtain the open tmp files before the open files because apparently getting the entries of /tmp using
"We obtain the open tmp files before the open files because in Pharo 7 and ealier getting the entries of /tmp using

'/tmp' asFileReference entries

opens a file descriptor and lets the FD open. Thus #numberOfOpenFiles, using lsof, detects /tmp as an open file and makes the test fail.

This happens only in travis under Ubuntu.
"

leaves the /tmp file descriptor open. Thus #numberOfOpenFiles, using lsof, detects /tmp as an open file and makes the test fail.
Fixed in Pharo 8."
| openTmpFiles |
openTmpFiles := self numberOfExistingTempStreamFiles.
^ Array with: self numberOfOpenFiles with: openTmpFiles
18 changes: 7 additions & 11 deletions ...OSSubprocess-Tests-Unit.package/OSSUnixSubprocessTest.class/instance/numberOfOpenFiles.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,16 @@
helpers
numberOfOpenFiles
"This is estimation number. Not to be used for real code. IT's basically
to check the number of opened files (regular files, directories, pipes) at the beginning of a test and at the end, to validate we are not leaving behind opened files.
This should work in most Unix-like and Linux
"
"This is estimation number. Not to be used for real code. It's basically to check the number of opened FIFO files at the beginning of a test and at the end, to validate we are not leaving behind opened files.
This should work in most Unix-like and Linux systems.
Only FIFO files are checked as we can't control other threads, and it is redirecting stdio that is happening in the tests."
| tmpFileName openFiles |
tmpFileName := (FileSystem workingDirectory / 'openFilesByPharoVM-' , UUID new printString) fullName.
tmpFileName asFileReference ensureDelete.
self systemAccessor system: ('lsof -p ', OSSVMProcess vmProcess pid printString, ' > "', tmpFileName, '" 2>&1').
openFiles := tmpFileName asFileReference readStreamDo: [ :str | | lines |
"We avoid the first header line"
lines := str contents lines allButFirst sorted.

"We then ignore all file properties except for the file name"
lines collect: [ :each | each substrings last ]
lines := str contents lines.
"Count only pipes"
lines select: [ :each | each includesSubstring: 'FIFO' ]
].
tmpFileName asFileReference ensureDelete.
^ openFiles

^ openFiles size
2 changes: 1 addition & 1 deletion ...SubprocessTest.class/instance/testReadingFromStdoutAfterCommandFinishesDoesNotBlocksVM.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ testReadingFromStdoutAfterCommandFinishesDoesNotBlocksVM
streamsInfo := self getStreamsInfoForRunningTest.
command := self newCommand
command: '/bin/sleep';
arguments: (Array with: '15');
arguments: (Array with: '1');
redirectStdout;
runAndWait.

Expand Down