diff options
Diffstat (limited to 'meta/lib/patchtest/patch.py')
-rw-r--r-- | meta/lib/patchtest/patch.py | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/meta/lib/patchtest/patch.py b/meta/lib/patchtest/patch.py index baf6283873..90faf3eeb4 100644 --- a/meta/lib/patchtest/patch.py +++ b/meta/lib/patchtest/patch.py | |||
@@ -14,22 +14,12 @@ import utils | |||
14 | logger = logging.getLogger('patchtest') | 14 | logger = logging.getLogger('patchtest') |
15 | 15 | ||
16 | class PatchTestPatch(object): | 16 | class PatchTestPatch(object): |
17 | MERGE_STATUS_INVALID = 'INVALID' | ||
18 | MERGE_STATUS_NOT_MERGED = 'NOTMERGED' | ||
19 | MERGE_STATUS_MERGED_SUCCESSFULL = 'PASS' | ||
20 | MERGE_STATUS_MERGED_FAIL = 'FAIL' | ||
21 | MERGE_STATUS = (MERGE_STATUS_INVALID, | ||
22 | MERGE_STATUS_NOT_MERGED, | ||
23 | MERGE_STATUS_MERGED_SUCCESSFULL, | ||
24 | MERGE_STATUS_MERGED_FAIL) | ||
25 | |||
26 | def __init__(self, path, forcereload=False): | 17 | def __init__(self, path, forcereload=False): |
27 | self._path = path | 18 | self._path = path |
28 | self._forcereload = forcereload | 19 | self._forcereload = forcereload |
29 | 20 | ||
30 | self._contents = None | 21 | self._contents = None |
31 | self._branch = None | 22 | self._branch = None |
32 | self._merge_status = PatchTestPatch.MERGE_STATUS_NOT_MERGED | ||
33 | 23 | ||
34 | @property | 24 | @property |
35 | def contents(self): | 25 | def contents(self): |
@@ -51,12 +41,3 @@ class PatchTestPatch(object): | |||
51 | if not self._branch: | 41 | if not self._branch: |
52 | self._branch = utils.get_branch(self._path) | 42 | self._branch = utils.get_branch(self._path) |
53 | return self._branch | 43 | return self._branch |
54 | |||
55 | def setmergestatus(self, status): | ||
56 | self._merge_status = status | ||
57 | |||
58 | def getmergestatus(self): | ||
59 | return self._merge_status | ||
60 | |||
61 | merge_status = property(getmergestatus, setmergestatus) | ||
62 | |||