FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

fix conflicts with rebase · exkson/ceph-devstack@2726844 · GitHub

Repository navigation

Commit 2726844

Browse files
committed
fix conflicts with rebase
C Add 'logs' command to CLI
1 parent 00570f0 commit 2726844

3 files changed

Lines changed: 13 additions & 4 deletions

File tree

‎ceph_devstack/__init__.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,10 @@ def parse_args(args: List[str]) -> argparse.Namespace:
104104
"container",
105105
help="The container to wait for",
106106
)
107+
parser_log = subparsers.add_parser("logs", help="Dump teuthology logs")
108+
parser_log.add_argument("--run-name", type=str, default=None)
109+
parser_log.add_argument("--job-id", type=str, default=None)
110+
parser_log.add_argument("--locate", action=argparse.BooleanOptionalAction)
107111
return parser.parse_args(args)
108112

109113

‎ceph_devstack/cli.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,10 @@ async def run():
4040
return
4141
elif args.command == "wait":
4242
return await obj.wait(container_name=args.container)
43+
elif args.command == "logs":
44+
return await obj.logs(
45+
run_name=args.run_name, job_id=args.job_id, locate=args.locate
46+
)
4347
else:
4448
await obj.apply(args.command)
4549
return 0

‎ceph_devstack/resources/test/test_devstack.py‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
import tempfile
55
import random as rd
66
from datetime import datetime, timedelta
7-
import unittest
7+
8+
import pytest
89

910
from ceph_devstack import config
1011
from ceph_devstack.resources.ceph.utils import (
@@ -16,7 +17,7 @@
1617
from ceph_devstack.resources.ceph import CephDevStack
1718

1819

19-
class TestDevStack(unittest.IsolatedAsyncioTestCase):
20+
class TestDevStack:
2021
def test_get_logtimestamp(self):
2122
dirname = "root-2025-03-20_18:34:43-orch:cephadm:smoke-small-main-distro-default-testnode"
2223
assert get_logtimestamp(dirname) == datetime(2025, 3, 20, 18, 34, 43)
@@ -39,12 +40,12 @@ def test_get_job_id_returns_job_on_unique_job(self):
3940

4041
def test_get_job_id_throws_filenotfound_on_missing_job(self):
4142
jobs = []
42-
with self.assertRaises(FileNotFoundError):
43+
with pytest.raises(FileNotFoundError):
4344
get_job_id(jobs)
4445

4546
def test_get_job_id_throws_toomanyjobsfound_on_more_than_one_job(self):
4647
jobs = ["1", "2"]
47-
with self.assertRaises(TooManyJobsFound):
48+
with pytest.raises(TooManyJobsFound):
4849
get_job_id(jobs)
4950

5051
async def test_logs_command_display_log_file_of_latest_run(self):

0 commit comments

Comments
 (0)

Back | FazBrowse Home | New Git URL