Show More
@@ -91,6 +91,7 b' class TestRun(object):' | |||||
91 | check_call(['git', 'pull', 'origin', 'master']) |
|
91 | check_call(['git', 'pull', 'origin', 'master']) | |
92 | except CalledProcessError : |
|
92 | except CalledProcessError : | |
93 | check_call(['git', 'pull', ipy_http_repository, 'master']) |
|
93 | check_call(['git', 'pull', ipy_http_repository, 'master']) | |
|
94 | self.master_sha = check_output(['git', 'log', '-1', '--format=%h']).decode('ascii').strip() | |||
94 | os.chdir(basedir) |
|
95 | os.chdir(basedir) | |
95 |
|
96 | |||
96 | def get_branch(self): |
|
97 | def get_branch(self): | |
@@ -125,7 +126,7 b' class TestRun(object):' | |||||
125 | return s |
|
126 | return s | |
126 |
|
127 | |||
127 | if self.pr['mergeable']: |
|
128 | if self.pr['mergeable']: | |
128 | com = self.pr['head']['sha'][:7] + " merged into master" |
|
129 | com = self.pr['head']['sha'][:7] + " merged into master (%s)" % self.master_sha | |
129 | else: |
|
130 | else: | |
130 | com = self.pr['head']['sha'][:7] + " (can't merge cleanly)" |
|
131 | com = self.pr['head']['sha'][:7] + " (can't merge cleanly)" | |
131 | lines = ["**Test results for commit %s**" % com, |
|
132 | lines = ["**Test results for commit %s**" % com, | |
@@ -146,10 +147,12 b' class TestRun(object):' | |||||
146 | pr = self.pr |
|
147 | pr = self.pr | |
147 |
|
148 | |||
148 | print("\n") |
|
149 | print("\n") | |
|
150 | msg = "**Test results for commit %s" % pr['head']['sha'][:7] | |||
149 | if pr['mergeable']: |
|
151 | if pr['mergeable']: | |
150 | print("**Test results for commit %s merged into master**" % pr['head']['sha'][:7]) |
|
152 | msg += " merged into master (%s)**" % self.master_sha | |
151 | else: |
|
153 | else: | |
152 | print("**Test results for commit %s (can't merge cleanly)**" % pr['head']['sha'][:7]) |
|
154 | msg += " (can't merge cleanly)**" | |
|
155 | print(msg) | |||
153 | print("Platform:", sys.platform) |
|
156 | print("Platform:", sys.platform) | |
154 | for result in self.results: |
|
157 | for result in self.results: | |
155 | if result.passed: |
|
158 | if result.passed: |
General Comments 0
You need to be logged in to leave comments.
Login now