Commit 099221eb authored by Michele Carignani's avatar Michele Carignani
Browse files

fix commit url ordering, reintroduce basespec.docx

parent a23c377d

robot2doc/basespec.docx

0 → 100755
+119 KiB

File added.

No diff preview for this file type.

View file

robot2doc/lib.py

+4 −5
Original line number Original line Diff line number Diff line
@@ -113,7 +113,7 @@ def gen_api_suite(sec_ref, suite, spec, workspace, commit_id, sol): 
    print("++ Generating test suite: {} {} {}".format(sol, sec_ref, suite))

    print("++ Generating test suite: {} {} {}".format(sol, sec_ref, suite))

    spec.add_sub_heading_from_ref(str(suite), sec_ref, config.DOC_SUITE_LEVEL)

    spec.add_sub_heading_from_ref(str(suite), sec_ref, config.DOC_SUITE_LEVEL)

    for i in suite.tests:

    for i in suite.tests:

        url = build_test_url(str(suite)+".robot", commit_id, sol, workspace)

        url = build_test_url(commit_id, sol, workspace, str(suite)+".robot")





        log_line = ["++++ TD: ", sol, workspace, suite, i]

        log_line = ["++++ TD: ", sol, workspace, suite, i]

        not QUIET and print(",".join([str(x) for x in log_line]))

        not QUIET and print(",".join([str(x) for x in log_line]))
@@ -202,4 +202,3 @@ def build_test_url(commit, sol, api, robot_file): 
        return configured_prefix + commit+"/"+sol+"/"+api+"/"+robot_file

        return configured_prefix + commit+"/"+sol+"/"+api+"/"+robot_file





    return None
 
    return None

robot2doc/test_create_sols.py

+3 −0
Original line number Original line Diff line number Diff line
@@ -4,6 +4,7 @@ Tests for NFV TST 010 attachments generation script 




import create_sols as crs

import create_sols as crs







def test_parse_tag_from_log():

def test_parse_tag_from_log():

    '''Test usage of parse_tag_from_log'''

    '''Test usage of parse_tag_from_log'''
@@ -13,6 +14,7 @@ def test_parse_tag_from_log(): 
    assert crs.parse_tag_from_log(with_tag) == "2.7.1.0.0.2"

    assert crs.parse_tag_from_log(with_tag) == "2.7.1.0.0.2"

    assert crs.parse_tag_from_log(without_tag) is None

    assert crs.parse_tag_from_log(without_tag) is None







def test_parse_commit_from_log():

def test_parse_commit_from_log():

    '''Test usage of parse_tag_from_log'''

    '''Test usage of parse_tag_from_log'''
@@ -24,6 +26,7 @@ def test_parse_commit_from_log(): 
    assert crs.parse_commit_from_log(without_tag) == "023ca44"

    assert crs.parse_commit_from_log(without_tag) == "023ca44"

    assert crs.parse_commit_from_log(wrong) is None

    assert crs.parse_commit_from_log(wrong) is None







def test_get_git_reference():

def test_get_git_reference():





    comm, reftype = crs.get_git_reference("..")

    comm, reftype = crs.get_git_reference("..")

robot2doc/test_lib.py

+1 −1
Original line number Original line Diff line number Diff line
@@ -62,7 +62,7 @@ def test_gen_api_suite(): 




    sec_ref = lib.DocReference.from_str("6.4.5.1.1")

    sec_ref = lib.DocReference.from_str("6.4.5.1.1")

    suite = TestSuiteBuilder().build("../examples/SOL002/VNFConfiguration-API/Configuration.robot")

    suite = TestSuiteBuilder().build("../examples/SOL002/VNFConfiguration-API/Configuration.robot")

    spec = TestSpec("empty.docx")

    spec = TestSpec()

    workspace = "Another-API"

    workspace = "Another-API"

    commit_id = "deadbeef"

    commit_id = "deadbeef"

    sol = "SOL002"

    sol = "SOL002"