diff options
| author | Christian Stenger <christian.stenger@digia.com> | 2013-05-02 16:38:42 +0200 |
|---|---|---|
| committer | Christian Stenger <christian.stenger@digia.com> | 2013-05-06 12:35:20 +0200 |
| commit | cc765472d25c9727309e8ebc0a4b1b2448b0cdaa (patch) | |
| tree | bd63f8b57a138884272a6e81f8b79196dc34e969 | |
| parent | b97af0ad87de15f5ffbcca03b01f79906cd62809 (diff) | |
Squish: Use readFile() if possible
Change-Id: Ia850e624f24dd57589d7276af22aef1498c3c799
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
| -rwxr-xr-x | tests/system/suite_HELP/tst_HELP02/test.py | 4 | ||||
| -rw-r--r-- | tests/system/suite_editors/tst_select_all/test.py | 9 |
2 files changed, 2 insertions, 11 deletions
diff --git a/tests/system/suite_HELP/tst_HELP02/test.py b/tests/system/suite_HELP/tst_HELP02/test.py index 4133724fb8..b6b19ee6f8 100755 --- a/tests/system/suite_HELP/tst_HELP02/test.py +++ b/tests/system/suite_HELP/tst_HELP02/test.py @@ -16,9 +16,7 @@ def getQtCreatorVersionFromDialog(): def getQtCreatorVersionFromFile(): qtCreatorPriFileName = "../../../../qtcreator.pri" # open file <qtCreatorPriFileName> and read version - file = open(qtCreatorPriFileName, "r") - fileText = file.read() - file.close() + fileText = readFile(qtCreatorPriFileName) chk = re.search("(?<=QTCREATOR_VERSION =)\s\d+.\d+.\d+", fileText) try: ver = chk.group(0).strip() diff --git a/tests/system/suite_editors/tst_select_all/test.py b/tests/system/suite_editors/tst_select_all/test.py index 81f051a59a..21ee3a7dc3 100644 --- a/tests/system/suite_editors/tst_select_all/test.py +++ b/tests/system/suite_editors/tst_select_all/test.py @@ -2,13 +2,6 @@ source("../../shared/qtcreator.py") # This tests for QTCREATORBUG-5757 -# Results can differ from actual size on disk (different line endings on Windows) -def charactersInFile(filename): - f = open(filename,"r") - content = f.read() - f.close() - return len(content) - def main(): files = map(lambda record: os.path.join(srcPath, testData.field(record, "filename")), testData.dataset("files.tsv")) @@ -21,7 +14,7 @@ def main(): return for currentFile in files: test.log("Opening file %s" % currentFile) - size = charactersInFile(currentFile) + size = len(readFile(currentFile)) invokeMenuItem("File", "Open File or Project...") selectFromFileDialog(currentFile, True) editor = getEditorForFileSuffix(currentFile) |