From 127c5d46e03df6d589dc87441481df521b0f9d9f Mon Sep 17 00:00:00 2001 From: Pacman Ghost Date: Sun, 9 Apr 2023 14:34:59 +0700 Subject: [PATCH] Updated the dependencies. --- .pylintrc | 2 +- conftest.py | 13 +- requirements-dev.txt | 14 +- requirements.txt | 8 +- vasl_templates/webapp/static/help/index.html | 2 +- vasl_templates/webapp/templates/index.html | 83 +- vasl_templates/webapp/tests/control_tests.py | 2 + .../webapp/tests/control_tests_servicer.py | 2 + .../proto/generated/control_tests_pb2.py | 1610 +---------------- .../tests/proto/set_data_dir_request.py | 2 +- .../set_default_template_pack_request.py | 2 +- .../tests/proto/set_vasl_version_request.py | 2 +- .../proto/set_veh_ord_notes_dir_request.py | 2 +- .../webapp/tests/test_scenario_search.py | 5 +- vasl_templates/webapp/tests/test_vassal.py | 3 +- vasl_templates/webapp/tests/utils.py | 7 + 16 files changed, 168 insertions(+), 1591 deletions(-) diff --git a/.pylintrc b/.pylintrc index 8be7546..f574c8e 100644 --- a/.pylintrc +++ b/.pylintrc @@ -480,4 +480,4 @@ known-third-party=enchant # Exceptions that will emit a warning when being caught. Defaults to # "Exception" -overgeneral-exceptions=Exception +overgeneral-exceptions=builtins.Exception diff --git a/conftest.py b/conftest.py index f0d5176..da438cf 100644 --- a/conftest.py +++ b/conftest.py @@ -10,8 +10,6 @@ import urllib.request from urllib.error import URLError import pytest -from flask import url_for - from vasl_templates.webapp import app from vasl_templates.webapp.tests import utils from vasl_templates.webapp.tests.control_tests import ControlTests @@ -19,6 +17,7 @@ from vasl_templates.webapp.tests.control_tests import ControlTests FLASK_WEBAPP_PORT = 5011 _pytest_options = None +_orig_url_for = app.url_for # --------------------------------------------------------------------- @@ -129,7 +128,9 @@ def _make_webapp(): # NOTE: It's not a bad idea to bypass the clipboard, even when running in a browser, # to avoid problems if something else uses the clipboard while the tests are running. kwargs["store_clipboard"] = 1 - url = url_for( endpoint, _external=True, **kwargs ) + if kwargs.get( "_external" ) is None: + kwargs["_external"] = True + url = _orig_url_for( endpoint, **kwargs ) url = url.replace( "http://localhost", app.base_url ) return url app.url_for = make_webapp_url @@ -219,12 +220,14 @@ def webdriver( request ): log_fname = os.path.join( tempfile.gettempdir(), "webdriver-pytest.log" ) if driver == "firefox": options = wb.FirefoxOptions() - options.headless = _pytest_options.headless + if _pytest_options.headless: + options.add_argument( "--headless" ) service = wb.firefox.service.Service( log_path=log_fname ) driver = wb.Firefox( options=options, service=service ) elif driver == "chrome": options = wb.ChromeOptions() - options.headless = _pytest_options.headless + if _pytest_options.headless: + options.add_argument( "--headless" ) options.add_argument( "--disable-gpu" ) driver = wb.Chrome( options=options ) else: diff --git a/requirements-dev.txt b/requirements-dev.txt index 1a9e3fb..e4362f2 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,7 +1,7 @@ -pytest==7.1.2 -grpcio-tools==1.46.3 -tabulate==0.8.9 -lxml==4.9.0 -pylint==2.14.1 -pytest-pylint==0.18.0 -pyinstaller==5.1 +pytest==7.2.2 +grpcio-tools==1.53.0 +tabulate==0.9.0 +lxml==4.9.2 +pylint==2.17.2 +pytest-pylint==0.19.0 +pyinstaller==5.9.0 diff --git a/requirements.txt b/requirements.txt index c7fd75e..f67fedb 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,9 +1,9 @@ -# python 3.10.7 +# python 3.10.10 -flask==2.1.2 +flask==2.2.3 pyyaml==6.0 -pillow==9.1.1 -selenium==4.2.0 +pillow==9.5.0 +selenium==4.8.3 waitress==2.1.2 appdirs==1.4.4 click==8.1.3 diff --git a/vasl_templates/webapp/static/help/index.html b/vasl_templates/webapp/static/help/index.html index efc0845..07807a0 100644 --- a/vasl_templates/webapp/static/help/index.html +++ b/vasl_templates/webapp/static/help/index.html @@ -73,7 +73,7 @@ If you have Docker installed, the webapp can be run in a container e.g.

You can also run the program directly from the source code. Get a copy from here in the usual way, by git clone'ing it, or downloading a ZIP and unpacking it somewhere. -

The web server was written and tested using Python 3.10.7, but it doesn't do anything particularly funky, so any recent version of Python should work. +

The web server was written and tested using Python 3.10.10, but it doesn't do anything particularly funky, so any recent version of Python should work.

While not essential, it is strongly recommended that you set up a virtual environment first. Then cd into the project's root directory, and install the requirements (note the trailing period):

diff --git a/vasl_templates/webapp/templates/index.html b/vasl_templates/webapp/templates/index.html index c97cb26..bc86bac 100644 --- a/vasl_templates/webapp/templates/index.html +++ b/vasl_templates/webapp/templates/index.html @@ -141,34 +141,66 @@ + + @@ -190,7 +222,6 @@ gHelpUrl = "{{url_for('show_help')}}" ; - {%include "testing.html"%} diff --git a/vasl_templates/webapp/tests/control_tests.py b/vasl_templates/webapp/tests/control_tests.py index f14e15c..a8f9b66 100644 --- a/vasl_templates/webapp/tests/control_tests.py +++ b/vasl_templates/webapp/tests/control_tests.py @@ -9,6 +9,7 @@ from google.protobuf.empty_pb2 import Empty #pylint: disable=no-name-in-module from vasl_templates.webapp.tests.proto.generated.control_tests_pb2_grpc import ControlTestsStub from vasl_templates.webapp.tests.proto.utils import enum_from_string +#pylint: disable=no-name-in-module from vasl_templates.webapp.tests.proto.generated.control_tests_pb2 import \ SetVassalVersionRequest, SetVaslVersionRequest, SetVaslExtnInfoDirRequest, SetGpidRemappingsRequest, \ SetDataDirRequest, SetDefaultScenarioRequest, SetDefaultTemplatePackRequest, \ @@ -17,6 +18,7 @@ from vasl_templates.webapp.tests.proto.generated.control_tests_pb2 import \ DumpVsavRequest, GetVaslPiecesRequest, \ SetAppConfigValRequest, DeleteAppConfigValRequest, \ SaveTempFileRequest +#pylint: enable=no-name-in-module # --------------------------------------------------------------------- diff --git a/vasl_templates/webapp/tests/control_tests_servicer.py b/vasl_templates/webapp/tests/control_tests_servicer.py index 1d6e81c..1d16783 100644 --- a/vasl_templates/webapp/tests/control_tests_servicer.py +++ b/vasl_templates/webapp/tests/control_tests_servicer.py @@ -28,6 +28,7 @@ from vasl_templates.webapp import \ from vasl_templates.webapp.tests.proto.generated.control_tests_pb2_grpc \ import ControlTestsServicer as BaseControlTestsServicer +#pylint: disable=no-name-in-module from vasl_templates.webapp.tests.proto.generated.control_tests_pb2 import \ SetVassalVersionRequest, SetVaslVersionRequest, SetVaslExtnInfoDirRequest, SetGpidRemappingsRequest, \ SetDataDirRequest, SetDefaultScenarioRequest, SetDefaultTemplatePackRequest, \ @@ -39,6 +40,7 @@ from vasl_templates.webapp.tests.proto.generated.control_tests_pb2 import \ GetVassalVersionsResponse, GetVaslVersionsResponse, GetVaslExtnsResponse, GetVaslModWarningsResponse, \ GetLastSnippetImageResponse, GetLastAsaUploadResponse, \ DumpVsavResponse, GetVaslPiecesResponse, GetAppConfigResponse +#pylint: enable=no-name-in-module # nb: these are defined as a convenience _VaslExtnsTypes_NONE = SetVaslVersionRequest.VaslExtnsType.NONE #pylint: disable=no-member diff --git a/vasl_templates/webapp/tests/proto/generated/control_tests_pb2.py b/vasl_templates/webapp/tests/proto/generated/control_tests_pb2.py index 18c38a9..11a5696 100644 --- a/vasl_templates/webapp/tests/proto/generated/control_tests_pb2.py +++ b/vasl_templates/webapp/tests/proto/generated/control_tests_pb2.py @@ -2,9 +2,9 @@ # Generated by the protocol buffer compiler. DO NOT EDIT! # source: control_tests.proto """Generated protocol buffer code.""" +from google.protobuf.internal import builder as _builder from google.protobuf import descriptor as _descriptor -from google.protobuf import message as _message -from google.protobuf import reflection as _reflection +from google.protobuf import descriptor_pool as _descriptor_pool from google.protobuf import symbol_database as _symbol_database # @@protoc_insertion_point(imports) @@ -14,1541 +14,73 @@ _sym_db = _symbol_database.Default() from google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2 -DESCRIPTOR = _descriptor.FileDescriptor( - name='control_tests.proto', - package='', - syntax='proto3', - serialized_options=None, - create_key=_descriptor._internal_create_key, - serialized_pb=b'\n\x13\x63ontrol_tests.proto\x1a\x1bgoogle/protobuf/empty.proto\"*\n\x12StartTestsResponse\x12\x14\n\x0c\x63\x61pabilities\x18\x01 \x03(\t\"3\n\x19GetVassalVersionsResponse\x12\x16\n\x0evassalVersions\x18\x01 \x03(\t\"0\n\x17SetVassalVersionRequest\x12\x15\n\rvassalVersion\x18\x01 \x01(\t\"/\n\x17GetVaslVersionsResponse\x12\x14\n\x0cvaslVersions\x18\x01 \x03(\t\"\x9c\x01\n\x15SetVaslVersionRequest\x12\x13\n\x0bvaslVersion\x18\x01 \x01(\t\x12;\n\rvaslExtnsType\x18\x02 \x01(\x0e\x32$.SetVaslVersionRequest.VaslExtnsType\"1\n\rVaslExtnsType\x12\x08\n\x04NONE\x10\x00\x12\x08\n\x04REAL\x10\x01\x12\x0c\n\x08TEMP_DIR\x10\x02\"-\n\x14GetVaslExtnsResponse\x12\x15\n\rvaslExtnsJson\x18\x01 \x01(\t\",\n\x19SetVaslExtnInfoDirRequest\x12\x0f\n\x07\x64irName\x18\x01 \x01(\t\"6\n\x18SetGpidRemappingsRequest\x12\x1a\n\x12gpidRemappingsJson\x18\x01 \x01(\t\".\n\x1aGetVaslModWarningsResponse\x12\x10\n\x08warnings\x18\x01 \x03(\t\"_\n\x11SetDataDirRequest\x12+\n\x07\x64irType\x18\x01 \x01(\x0e\x32\x1a.SetDataDirRequest.DirType\"\x1d\n\x07\x44irType\x12\x08\n\x04TEST\x10\x00\x12\x08\n\x04REAL\x10\x01\"-\n\x19SetDefaultScenarioRequest\x12\x10\n\x08\x66ileName\x18\x01 \x01(\t\"\xc9\x01\n\x1dSetDefaultTemplatePackRequest\x12K\n\x10templatePackType\x18\x01 \x01(\x0e\x32/.SetDefaultTemplatePackRequest.TemplatePackTypeH\x00\x12\x11\n\x07\x64irName\x18\x02 \x01(\tH\x00\x12\x11\n\x07zipData\x18\x03 \x01(\x0cH\x00\")\n\x10TemplatePackType\x12\x0b\n\x07\x44\x45\x46\x41ULT\x10\x00\x12\x08\n\x04REAL\x10\x01\x42\n\n\x08tp_oneof\"w\n\x18SetVehOrdNotesDirRequest\x12\x32\n\x07\x64irType\x18\x01 \x01(\x0e\x32!.SetVehOrdNotesDirRequest.DirType\"\'\n\x07\x44irType\x12\x08\n\x04NONE\x10\x00\x12\x08\n\x04TEST\x10\x01\x12\x08\n\x04REAL\x10\x02\"*\n\x16SetUserFilesDirRequest\x12\x10\n\x08\x64irOrUrl\x18\x01 \x01(\t\".\n\x1aSetAsaScenarioIndexRequest\x12\x10\n\x08\x66ileName\x18\x01 \x01(\t\"/\n\x1bSetRoarScenarioIndexRequest\x12\x10\n\x08\x66ileName\x18\x01 \x01(\t\"0\n\x1bGetLastSnippetImageResponse\x12\x11\n\timageData\x18\x01 \x01(\x0c\"2\n\x18GetLastAsaUploadResponse\x12\x16\n\x0elastUploadJson\x18\x01 \x01(\t\"#\n\x0f\x44umpVsavRequest\x12\x10\n\x08vsavData\x18\x01 \x01(\x0c\"$\n\x10\x44umpVsavResponse\x12\x10\n\x08vsavDump\x18\x01 \x01(\t\"+\n\x14GetVaslPiecesRequest\x12\x13\n\x0bvaslVersion\x18\x01 \x01(\t\"9\n\x15GetVaslPiecesResponse\x12\x11\n\tpieceDump\x18\x01 \x01(\t\x12\r\n\x05gpids\x18\x02 \x03(\t\"-\n\x14GetAppConfigResponse\x12\x15\n\rappConfigJson\x18\x01 \x01(\t\"h\n\x16SetAppConfigValRequest\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x10\n\x06strVal\x18\x02 \x01(\tH\x00\x12\x10\n\x06intVal\x18\x03 \x01(\x05H\x00\x12\x11\n\x07\x62oolVal\x18\x04 \x01(\x08H\x00\x42\n\n\x08\x61\x63_oneof\"(\n\x19\x44\x65leteAppConfigValRequest\x12\x0b\n\x03key\x18\x01 \x01(\t\"5\n\x13SaveTempFileRequest\x12\x10\n\x08\x66ileName\x18\x01 \x01(\t\x12\x0c\n\x04\x64\x61ta\x18\x02 \x01(\x0c\x32\x89\x0e\n\x0c\x43ontrolTests\x12\x39\n\nstartTests\x12\x16.google.protobuf.Empty\x1a\x13.StartTestsResponse\x12:\n\x08\x65ndTests\x12\x16.google.protobuf.Empty\x1a\x16.google.protobuf.Empty\x12G\n\x11getVassalVersions\x12\x16.google.protobuf.Empty\x1a\x1a.GetVassalVersionsResponse\x12\x44\n\x10setVassalVersion\x12\x18.SetVassalVersionRequest\x1a\x16.google.protobuf.Empty\x12\x43\n\x0fgetVaslVersions\x12\x16.google.protobuf.Empty\x1a\x18.GetVaslVersionsResponse\x12@\n\x0esetVaslVersion\x12\x16.SetVaslVersionRequest\x1a\x16.google.protobuf.Empty\x12=\n\x0cgetVaslExtns\x12\x16.google.protobuf.Empty\x1a\x15.GetVaslExtnsResponse\x12H\n\x12setVaslExtnInfoDir\x12\x1a.SetVaslExtnInfoDirRequest\x1a\x16.google.protobuf.Empty\x12\x46\n\x11setGpidRemappings\x12\x19.SetGpidRemappingsRequest\x1a\x16.google.protobuf.Empty\x12I\n\x12getVaslModWarnings\x12\x16.google.protobuf.Empty\x1a\x1b.GetVaslModWarningsResponse\x12\x38\n\nsetDataDir\x12\x12.SetDataDirRequest\x1a\x16.google.protobuf.Empty\x12H\n\x12setDefaultScenario\x12\x1a.SetDefaultScenarioRequest\x1a\x16.google.protobuf.Empty\x12P\n\x16setDefaultTemplatePack\x12\x1e.SetDefaultTemplatePackRequest\x1a\x16.google.protobuf.Empty\x12\x46\n\x11setVehOrdNotesDir\x12\x19.SetVehOrdNotesDirRequest\x1a\x16.google.protobuf.Empty\x12\x42\n\x0fsetUserFilesDir\x12\x17.SetUserFilesDirRequest\x1a\x16.google.protobuf.Empty\x12J\n\x13setAsaScenarioIndex\x12\x1b.SetAsaScenarioIndexRequest\x1a\x16.google.protobuf.Empty\x12L\n\x14setRoarScenarioIndex\x12\x1c.SetRoarScenarioIndexRequest\x1a\x16.google.protobuf.Empty\x12K\n\x13getLastSnippetImage\x12\x16.google.protobuf.Empty\x1a\x1c.GetLastSnippetImageResponse\x12\x44\n\x12resetLastAsaUpload\x12\x16.google.protobuf.Empty\x1a\x16.google.protobuf.Empty\x12\x45\n\x10getLastAsaUpload\x12\x16.google.protobuf.Empty\x1a\x19.GetLastAsaUploadResponse\x12/\n\x08\x64umpVsav\x12\x10.DumpVsavRequest\x1a\x11.DumpVsavResponse\x12>\n\rgetVaslPieces\x12\x15.GetVaslPiecesRequest\x1a\x16.GetVaslPiecesResponse\x12=\n\x0cgetAppConfig\x12\x16.google.protobuf.Empty\x1a\x15.GetAppConfigResponse\x12\x42\n\x0fsetAppConfigVal\x12\x17.SetAppConfigValRequest\x1a\x16.google.protobuf.Empty\x12H\n\x12\x64\x65leteAppConfigVal\x12\x1a.DeleteAppConfigValRequest\x1a\x16.google.protobuf.Empty\x12<\n\x0csaveTempFile\x12\x14.SaveTempFileRequest\x1a\x16.google.protobuf.Emptyb\x06proto3' - , - dependencies=[google_dot_protobuf_dot_empty__pb2.DESCRIPTOR,]) - - - -_SETVASLVERSIONREQUEST_VASLEXTNSTYPE = _descriptor.EnumDescriptor( - name='VaslExtnsType', - full_name='SetVaslVersionRequest.VaslExtnsType', - filename=None, - file=DESCRIPTOR, - create_key=_descriptor._internal_create_key, - values=[ - _descriptor.EnumValueDescriptor( - name='NONE', index=0, number=0, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='REAL', index=1, number=1, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='TEMP_DIR', index=2, number=2, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - ], - containing_type=None, - serialized_options=None, - serialized_start=356, - serialized_end=405, -) -_sym_db.RegisterEnumDescriptor(_SETVASLVERSIONREQUEST_VASLEXTNSTYPE) - -_SETDATADIRREQUEST_DIRTYPE = _descriptor.EnumDescriptor( - name='DirType', - full_name='SetDataDirRequest.DirType', - filename=None, - file=DESCRIPTOR, - create_key=_descriptor._internal_create_key, - values=[ - _descriptor.EnumValueDescriptor( - name='TEST', index=0, number=0, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='REAL', index=1, number=1, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - ], - containing_type=None, - serialized_options=None, - serialized_start=670, - serialized_end=699, -) -_sym_db.RegisterEnumDescriptor(_SETDATADIRREQUEST_DIRTYPE) - -_SETDEFAULTTEMPLATEPACKREQUEST_TEMPLATEPACKTYPE = _descriptor.EnumDescriptor( - name='TemplatePackType', - full_name='SetDefaultTemplatePackRequest.TemplatePackType', - filename=None, - file=DESCRIPTOR, - create_key=_descriptor._internal_create_key, - values=[ - _descriptor.EnumValueDescriptor( - name='DEFAULT', index=0, number=0, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='REAL', index=1, number=1, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - ], - containing_type=None, - serialized_options=None, - serialized_start=897, - serialized_end=938, -) -_sym_db.RegisterEnumDescriptor(_SETDEFAULTTEMPLATEPACKREQUEST_TEMPLATEPACKTYPE) - -_SETVEHORDNOTESDIRREQUEST_DIRTYPE = _descriptor.EnumDescriptor( - name='DirType', - full_name='SetVehOrdNotesDirRequest.DirType', - filename=None, - file=DESCRIPTOR, - create_key=_descriptor._internal_create_key, - values=[ - _descriptor.EnumValueDescriptor( - name='NONE', index=0, number=0, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='TEST', index=1, number=1, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='REAL', index=2, number=2, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - ], - containing_type=None, - serialized_options=None, - serialized_start=1032, - serialized_end=1071, -) -_sym_db.RegisterEnumDescriptor(_SETVEHORDNOTESDIRREQUEST_DIRTYPE) - - -_STARTTESTSRESPONSE = _descriptor.Descriptor( - name='StartTestsResponse', - full_name='StartTestsResponse', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='capabilities', full_name='StartTestsResponse.capabilities', index=0, - number=1, type=9, cpp_type=9, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=52, - serialized_end=94, -) - - -_GETVASSALVERSIONSRESPONSE = _descriptor.Descriptor( - name='GetVassalVersionsResponse', - full_name='GetVassalVersionsResponse', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='vassalVersions', full_name='GetVassalVersionsResponse.vassalVersions', index=0, - number=1, type=9, cpp_type=9, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=96, - serialized_end=147, -) - - -_SETVASSALVERSIONREQUEST = _descriptor.Descriptor( - name='SetVassalVersionRequest', - full_name='SetVassalVersionRequest', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='vassalVersion', full_name='SetVassalVersionRequest.vassalVersion', index=0, - number=1, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=149, - serialized_end=197, -) - - -_GETVASLVERSIONSRESPONSE = _descriptor.Descriptor( - name='GetVaslVersionsResponse', - full_name='GetVaslVersionsResponse', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='vaslVersions', full_name='GetVaslVersionsResponse.vaslVersions', index=0, - number=1, type=9, cpp_type=9, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=199, - serialized_end=246, -) - - -_SETVASLVERSIONREQUEST = _descriptor.Descriptor( - name='SetVaslVersionRequest', - full_name='SetVaslVersionRequest', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='vaslVersion', full_name='SetVaslVersionRequest.vaslVersion', index=0, - number=1, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='vaslExtnsType', full_name='SetVaslVersionRequest.vaslExtnsType', index=1, - number=2, type=14, cpp_type=8, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - _SETVASLVERSIONREQUEST_VASLEXTNSTYPE, - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=249, - serialized_end=405, -) - - -_GETVASLEXTNSRESPONSE = _descriptor.Descriptor( - name='GetVaslExtnsResponse', - full_name='GetVaslExtnsResponse', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='vaslExtnsJson', full_name='GetVaslExtnsResponse.vaslExtnsJson', index=0, - number=1, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=407, - serialized_end=452, -) - - -_SETVASLEXTNINFODIRREQUEST = _descriptor.Descriptor( - name='SetVaslExtnInfoDirRequest', - full_name='SetVaslExtnInfoDirRequest', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='dirName', full_name='SetVaslExtnInfoDirRequest.dirName', index=0, - number=1, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=454, - serialized_end=498, -) - - -_SETGPIDREMAPPINGSREQUEST = _descriptor.Descriptor( - name='SetGpidRemappingsRequest', - full_name='SetGpidRemappingsRequest', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='gpidRemappingsJson', full_name='SetGpidRemappingsRequest.gpidRemappingsJson', index=0, - number=1, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=500, - serialized_end=554, -) - - -_GETVASLMODWARNINGSRESPONSE = _descriptor.Descriptor( - name='GetVaslModWarningsResponse', - full_name='GetVaslModWarningsResponse', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='warnings', full_name='GetVaslModWarningsResponse.warnings', index=0, - number=1, type=9, cpp_type=9, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=556, - serialized_end=602, -) - - -_SETDATADIRREQUEST = _descriptor.Descriptor( - name='SetDataDirRequest', - full_name='SetDataDirRequest', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='dirType', full_name='SetDataDirRequest.dirType', index=0, - number=1, type=14, cpp_type=8, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - _SETDATADIRREQUEST_DIRTYPE, - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=604, - serialized_end=699, -) - - -_SETDEFAULTSCENARIOREQUEST = _descriptor.Descriptor( - name='SetDefaultScenarioRequest', - full_name='SetDefaultScenarioRequest', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='fileName', full_name='SetDefaultScenarioRequest.fileName', index=0, - number=1, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=701, - serialized_end=746, -) - - -_SETDEFAULTTEMPLATEPACKREQUEST = _descriptor.Descriptor( - name='SetDefaultTemplatePackRequest', - full_name='SetDefaultTemplatePackRequest', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='templatePackType', full_name='SetDefaultTemplatePackRequest.templatePackType', index=0, - number=1, type=14, cpp_type=8, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='dirName', full_name='SetDefaultTemplatePackRequest.dirName', index=1, - number=2, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='zipData', full_name='SetDefaultTemplatePackRequest.zipData', index=2, - number=3, type=12, cpp_type=9, label=1, - has_default_value=False, default_value=b"", - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - _SETDEFAULTTEMPLATEPACKREQUEST_TEMPLATEPACKTYPE, - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - _descriptor.OneofDescriptor( - name='tp_oneof', full_name='SetDefaultTemplatePackRequest.tp_oneof', - index=0, containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[]), - ], - serialized_start=749, - serialized_end=950, -) - - -_SETVEHORDNOTESDIRREQUEST = _descriptor.Descriptor( - name='SetVehOrdNotesDirRequest', - full_name='SetVehOrdNotesDirRequest', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='dirType', full_name='SetVehOrdNotesDirRequest.dirType', index=0, - number=1, type=14, cpp_type=8, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - _SETVEHORDNOTESDIRREQUEST_DIRTYPE, - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=952, - serialized_end=1071, -) - - -_SETUSERFILESDIRREQUEST = _descriptor.Descriptor( - name='SetUserFilesDirRequest', - full_name='SetUserFilesDirRequest', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='dirOrUrl', full_name='SetUserFilesDirRequest.dirOrUrl', index=0, - number=1, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=1073, - serialized_end=1115, -) - - -_SETASASCENARIOINDEXREQUEST = _descriptor.Descriptor( - name='SetAsaScenarioIndexRequest', - full_name='SetAsaScenarioIndexRequest', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='fileName', full_name='SetAsaScenarioIndexRequest.fileName', index=0, - number=1, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=1117, - serialized_end=1163, -) - - -_SETROARSCENARIOINDEXREQUEST = _descriptor.Descriptor( - name='SetRoarScenarioIndexRequest', - full_name='SetRoarScenarioIndexRequest', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='fileName', full_name='SetRoarScenarioIndexRequest.fileName', index=0, - number=1, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=1165, - serialized_end=1212, -) - - -_GETLASTSNIPPETIMAGERESPONSE = _descriptor.Descriptor( - name='GetLastSnippetImageResponse', - full_name='GetLastSnippetImageResponse', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='imageData', full_name='GetLastSnippetImageResponse.imageData', index=0, - number=1, type=12, cpp_type=9, label=1, - has_default_value=False, default_value=b"", - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=1214, - serialized_end=1262, -) - - -_GETLASTASAUPLOADRESPONSE = _descriptor.Descriptor( - name='GetLastAsaUploadResponse', - full_name='GetLastAsaUploadResponse', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='lastUploadJson', full_name='GetLastAsaUploadResponse.lastUploadJson', index=0, - number=1, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=1264, - serialized_end=1314, -) - - -_DUMPVSAVREQUEST = _descriptor.Descriptor( - name='DumpVsavRequest', - full_name='DumpVsavRequest', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='vsavData', full_name='DumpVsavRequest.vsavData', index=0, - number=1, type=12, cpp_type=9, label=1, - has_default_value=False, default_value=b"", - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=1316, - serialized_end=1351, -) - - -_DUMPVSAVRESPONSE = _descriptor.Descriptor( - name='DumpVsavResponse', - full_name='DumpVsavResponse', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='vsavDump', full_name='DumpVsavResponse.vsavDump', index=0, - number=1, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=1353, - serialized_end=1389, -) - - -_GETVASLPIECESREQUEST = _descriptor.Descriptor( - name='GetVaslPiecesRequest', - full_name='GetVaslPiecesRequest', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='vaslVersion', full_name='GetVaslPiecesRequest.vaslVersion', index=0, - number=1, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=1391, - serialized_end=1434, -) - - -_GETVASLPIECESRESPONSE = _descriptor.Descriptor( - name='GetVaslPiecesResponse', - full_name='GetVaslPiecesResponse', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='pieceDump', full_name='GetVaslPiecesResponse.pieceDump', index=0, - number=1, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='gpids', full_name='GetVaslPiecesResponse.gpids', index=1, - number=2, type=9, cpp_type=9, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=1436, - serialized_end=1493, -) - - -_GETAPPCONFIGRESPONSE = _descriptor.Descriptor( - name='GetAppConfigResponse', - full_name='GetAppConfigResponse', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='appConfigJson', full_name='GetAppConfigResponse.appConfigJson', index=0, - number=1, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=1495, - serialized_end=1540, -) - - -_SETAPPCONFIGVALREQUEST = _descriptor.Descriptor( - name='SetAppConfigValRequest', - full_name='SetAppConfigValRequest', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='key', full_name='SetAppConfigValRequest.key', index=0, - number=1, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='strVal', full_name='SetAppConfigValRequest.strVal', index=1, - number=2, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='intVal', full_name='SetAppConfigValRequest.intVal', index=2, - number=3, type=5, cpp_type=1, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='boolVal', full_name='SetAppConfigValRequest.boolVal', index=3, - number=4, type=8, cpp_type=7, label=1, - has_default_value=False, default_value=False, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - _descriptor.OneofDescriptor( - name='ac_oneof', full_name='SetAppConfigValRequest.ac_oneof', - index=0, containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[]), - ], - serialized_start=1542, - serialized_end=1646, -) - - -_DELETEAPPCONFIGVALREQUEST = _descriptor.Descriptor( - name='DeleteAppConfigValRequest', - full_name='DeleteAppConfigValRequest', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='key', full_name='DeleteAppConfigValRequest.key', index=0, - number=1, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=1648, - serialized_end=1688, -) - - -_SAVETEMPFILEREQUEST = _descriptor.Descriptor( - name='SaveTempFileRequest', - full_name='SaveTempFileRequest', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='fileName', full_name='SaveTempFileRequest.fileName', index=0, - number=1, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='data', full_name='SaveTempFileRequest.data', index=1, - number=2, type=12, cpp_type=9, label=1, - has_default_value=False, default_value=b"", - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=1690, - serialized_end=1743, -) - -_SETVASLVERSIONREQUEST.fields_by_name['vaslExtnsType'].enum_type = _SETVASLVERSIONREQUEST_VASLEXTNSTYPE -_SETVASLVERSIONREQUEST_VASLEXTNSTYPE.containing_type = _SETVASLVERSIONREQUEST -_SETDATADIRREQUEST.fields_by_name['dirType'].enum_type = _SETDATADIRREQUEST_DIRTYPE -_SETDATADIRREQUEST_DIRTYPE.containing_type = _SETDATADIRREQUEST -_SETDEFAULTTEMPLATEPACKREQUEST.fields_by_name['templatePackType'].enum_type = _SETDEFAULTTEMPLATEPACKREQUEST_TEMPLATEPACKTYPE -_SETDEFAULTTEMPLATEPACKREQUEST_TEMPLATEPACKTYPE.containing_type = _SETDEFAULTTEMPLATEPACKREQUEST -_SETDEFAULTTEMPLATEPACKREQUEST.oneofs_by_name['tp_oneof'].fields.append( - _SETDEFAULTTEMPLATEPACKREQUEST.fields_by_name['templatePackType']) -_SETDEFAULTTEMPLATEPACKREQUEST.fields_by_name['templatePackType'].containing_oneof = _SETDEFAULTTEMPLATEPACKREQUEST.oneofs_by_name['tp_oneof'] -_SETDEFAULTTEMPLATEPACKREQUEST.oneofs_by_name['tp_oneof'].fields.append( - _SETDEFAULTTEMPLATEPACKREQUEST.fields_by_name['dirName']) -_SETDEFAULTTEMPLATEPACKREQUEST.fields_by_name['dirName'].containing_oneof = _SETDEFAULTTEMPLATEPACKREQUEST.oneofs_by_name['tp_oneof'] -_SETDEFAULTTEMPLATEPACKREQUEST.oneofs_by_name['tp_oneof'].fields.append( - _SETDEFAULTTEMPLATEPACKREQUEST.fields_by_name['zipData']) -_SETDEFAULTTEMPLATEPACKREQUEST.fields_by_name['zipData'].containing_oneof = _SETDEFAULTTEMPLATEPACKREQUEST.oneofs_by_name['tp_oneof'] -_SETVEHORDNOTESDIRREQUEST.fields_by_name['dirType'].enum_type = _SETVEHORDNOTESDIRREQUEST_DIRTYPE -_SETVEHORDNOTESDIRREQUEST_DIRTYPE.containing_type = _SETVEHORDNOTESDIRREQUEST -_SETAPPCONFIGVALREQUEST.oneofs_by_name['ac_oneof'].fields.append( - _SETAPPCONFIGVALREQUEST.fields_by_name['strVal']) -_SETAPPCONFIGVALREQUEST.fields_by_name['strVal'].containing_oneof = _SETAPPCONFIGVALREQUEST.oneofs_by_name['ac_oneof'] -_SETAPPCONFIGVALREQUEST.oneofs_by_name['ac_oneof'].fields.append( - _SETAPPCONFIGVALREQUEST.fields_by_name['intVal']) -_SETAPPCONFIGVALREQUEST.fields_by_name['intVal'].containing_oneof = _SETAPPCONFIGVALREQUEST.oneofs_by_name['ac_oneof'] -_SETAPPCONFIGVALREQUEST.oneofs_by_name['ac_oneof'].fields.append( - _SETAPPCONFIGVALREQUEST.fields_by_name['boolVal']) -_SETAPPCONFIGVALREQUEST.fields_by_name['boolVal'].containing_oneof = _SETAPPCONFIGVALREQUEST.oneofs_by_name['ac_oneof'] -DESCRIPTOR.message_types_by_name['StartTestsResponse'] = _STARTTESTSRESPONSE -DESCRIPTOR.message_types_by_name['GetVassalVersionsResponse'] = _GETVASSALVERSIONSRESPONSE -DESCRIPTOR.message_types_by_name['SetVassalVersionRequest'] = _SETVASSALVERSIONREQUEST -DESCRIPTOR.message_types_by_name['GetVaslVersionsResponse'] = _GETVASLVERSIONSRESPONSE -DESCRIPTOR.message_types_by_name['SetVaslVersionRequest'] = _SETVASLVERSIONREQUEST -DESCRIPTOR.message_types_by_name['GetVaslExtnsResponse'] = _GETVASLEXTNSRESPONSE -DESCRIPTOR.message_types_by_name['SetVaslExtnInfoDirRequest'] = _SETVASLEXTNINFODIRREQUEST -DESCRIPTOR.message_types_by_name['SetGpidRemappingsRequest'] = _SETGPIDREMAPPINGSREQUEST -DESCRIPTOR.message_types_by_name['GetVaslModWarningsResponse'] = _GETVASLMODWARNINGSRESPONSE -DESCRIPTOR.message_types_by_name['SetDataDirRequest'] = _SETDATADIRREQUEST -DESCRIPTOR.message_types_by_name['SetDefaultScenarioRequest'] = _SETDEFAULTSCENARIOREQUEST -DESCRIPTOR.message_types_by_name['SetDefaultTemplatePackRequest'] = _SETDEFAULTTEMPLATEPACKREQUEST -DESCRIPTOR.message_types_by_name['SetVehOrdNotesDirRequest'] = _SETVEHORDNOTESDIRREQUEST -DESCRIPTOR.message_types_by_name['SetUserFilesDirRequest'] = _SETUSERFILESDIRREQUEST -DESCRIPTOR.message_types_by_name['SetAsaScenarioIndexRequest'] = _SETASASCENARIOINDEXREQUEST -DESCRIPTOR.message_types_by_name['SetRoarScenarioIndexRequest'] = _SETROARSCENARIOINDEXREQUEST -DESCRIPTOR.message_types_by_name['GetLastSnippetImageResponse'] = _GETLASTSNIPPETIMAGERESPONSE -DESCRIPTOR.message_types_by_name['GetLastAsaUploadResponse'] = _GETLASTASAUPLOADRESPONSE -DESCRIPTOR.message_types_by_name['DumpVsavRequest'] = _DUMPVSAVREQUEST -DESCRIPTOR.message_types_by_name['DumpVsavResponse'] = _DUMPVSAVRESPONSE -DESCRIPTOR.message_types_by_name['GetVaslPiecesRequest'] = _GETVASLPIECESREQUEST -DESCRIPTOR.message_types_by_name['GetVaslPiecesResponse'] = _GETVASLPIECESRESPONSE -DESCRIPTOR.message_types_by_name['GetAppConfigResponse'] = _GETAPPCONFIGRESPONSE -DESCRIPTOR.message_types_by_name['SetAppConfigValRequest'] = _SETAPPCONFIGVALREQUEST -DESCRIPTOR.message_types_by_name['DeleteAppConfigValRequest'] = _DELETEAPPCONFIGVALREQUEST -DESCRIPTOR.message_types_by_name['SaveTempFileRequest'] = _SAVETEMPFILEREQUEST -_sym_db.RegisterFileDescriptor(DESCRIPTOR) - -StartTestsResponse = _reflection.GeneratedProtocolMessageType('StartTestsResponse', (_message.Message,), { - 'DESCRIPTOR' : _STARTTESTSRESPONSE, - '__module__' : 'control_tests_pb2' - # @@protoc_insertion_point(class_scope:StartTestsResponse) - }) -_sym_db.RegisterMessage(StartTestsResponse) - -GetVassalVersionsResponse = _reflection.GeneratedProtocolMessageType('GetVassalVersionsResponse', (_message.Message,), { - 'DESCRIPTOR' : _GETVASSALVERSIONSRESPONSE, - '__module__' : 'control_tests_pb2' - # @@protoc_insertion_point(class_scope:GetVassalVersionsResponse) - }) -_sym_db.RegisterMessage(GetVassalVersionsResponse) - -SetVassalVersionRequest = _reflection.GeneratedProtocolMessageType('SetVassalVersionRequest', (_message.Message,), { - 'DESCRIPTOR' : _SETVASSALVERSIONREQUEST, - '__module__' : 'control_tests_pb2' - # @@protoc_insertion_point(class_scope:SetVassalVersionRequest) - }) -_sym_db.RegisterMessage(SetVassalVersionRequest) - -GetVaslVersionsResponse = _reflection.GeneratedProtocolMessageType('GetVaslVersionsResponse', (_message.Message,), { - 'DESCRIPTOR' : _GETVASLVERSIONSRESPONSE, - '__module__' : 'control_tests_pb2' - # @@protoc_insertion_point(class_scope:GetVaslVersionsResponse) - }) -_sym_db.RegisterMessage(GetVaslVersionsResponse) - -SetVaslVersionRequest = _reflection.GeneratedProtocolMessageType('SetVaslVersionRequest', (_message.Message,), { - 'DESCRIPTOR' : _SETVASLVERSIONREQUEST, - '__module__' : 'control_tests_pb2' - # @@protoc_insertion_point(class_scope:SetVaslVersionRequest) - }) -_sym_db.RegisterMessage(SetVaslVersionRequest) - -GetVaslExtnsResponse = _reflection.GeneratedProtocolMessageType('GetVaslExtnsResponse', (_message.Message,), { - 'DESCRIPTOR' : _GETVASLEXTNSRESPONSE, - '__module__' : 'control_tests_pb2' - # @@protoc_insertion_point(class_scope:GetVaslExtnsResponse) - }) -_sym_db.RegisterMessage(GetVaslExtnsResponse) - -SetVaslExtnInfoDirRequest = _reflection.GeneratedProtocolMessageType('SetVaslExtnInfoDirRequest', (_message.Message,), { - 'DESCRIPTOR' : _SETVASLEXTNINFODIRREQUEST, - '__module__' : 'control_tests_pb2' - # @@protoc_insertion_point(class_scope:SetVaslExtnInfoDirRequest) - }) -_sym_db.RegisterMessage(SetVaslExtnInfoDirRequest) - -SetGpidRemappingsRequest = _reflection.GeneratedProtocolMessageType('SetGpidRemappingsRequest', (_message.Message,), { - 'DESCRIPTOR' : _SETGPIDREMAPPINGSREQUEST, - '__module__' : 'control_tests_pb2' - # @@protoc_insertion_point(class_scope:SetGpidRemappingsRequest) - }) -_sym_db.RegisterMessage(SetGpidRemappingsRequest) - -GetVaslModWarningsResponse = _reflection.GeneratedProtocolMessageType('GetVaslModWarningsResponse', (_message.Message,), { - 'DESCRIPTOR' : _GETVASLMODWARNINGSRESPONSE, - '__module__' : 'control_tests_pb2' - # @@protoc_insertion_point(class_scope:GetVaslModWarningsResponse) - }) -_sym_db.RegisterMessage(GetVaslModWarningsResponse) - -SetDataDirRequest = _reflection.GeneratedProtocolMessageType('SetDataDirRequest', (_message.Message,), { - 'DESCRIPTOR' : _SETDATADIRREQUEST, - '__module__' : 'control_tests_pb2' - # @@protoc_insertion_point(class_scope:SetDataDirRequest) - }) -_sym_db.RegisterMessage(SetDataDirRequest) - -SetDefaultScenarioRequest = _reflection.GeneratedProtocolMessageType('SetDefaultScenarioRequest', (_message.Message,), { - 'DESCRIPTOR' : _SETDEFAULTSCENARIOREQUEST, - '__module__' : 'control_tests_pb2' - # @@protoc_insertion_point(class_scope:SetDefaultScenarioRequest) - }) -_sym_db.RegisterMessage(SetDefaultScenarioRequest) - -SetDefaultTemplatePackRequest = _reflection.GeneratedProtocolMessageType('SetDefaultTemplatePackRequest', (_message.Message,), { - 'DESCRIPTOR' : _SETDEFAULTTEMPLATEPACKREQUEST, - '__module__' : 'control_tests_pb2' - # @@protoc_insertion_point(class_scope:SetDefaultTemplatePackRequest) - }) -_sym_db.RegisterMessage(SetDefaultTemplatePackRequest) - -SetVehOrdNotesDirRequest = _reflection.GeneratedProtocolMessageType('SetVehOrdNotesDirRequest', (_message.Message,), { - 'DESCRIPTOR' : _SETVEHORDNOTESDIRREQUEST, - '__module__' : 'control_tests_pb2' - # @@protoc_insertion_point(class_scope:SetVehOrdNotesDirRequest) - }) -_sym_db.RegisterMessage(SetVehOrdNotesDirRequest) - -SetUserFilesDirRequest = _reflection.GeneratedProtocolMessageType('SetUserFilesDirRequest', (_message.Message,), { - 'DESCRIPTOR' : _SETUSERFILESDIRREQUEST, - '__module__' : 'control_tests_pb2' - # @@protoc_insertion_point(class_scope:SetUserFilesDirRequest) - }) -_sym_db.RegisterMessage(SetUserFilesDirRequest) - -SetAsaScenarioIndexRequest = _reflection.GeneratedProtocolMessageType('SetAsaScenarioIndexRequest', (_message.Message,), { - 'DESCRIPTOR' : _SETASASCENARIOINDEXREQUEST, - '__module__' : 'control_tests_pb2' - # @@protoc_insertion_point(class_scope:SetAsaScenarioIndexRequest) - }) -_sym_db.RegisterMessage(SetAsaScenarioIndexRequest) - -SetRoarScenarioIndexRequest = _reflection.GeneratedProtocolMessageType('SetRoarScenarioIndexRequest', (_message.Message,), { - 'DESCRIPTOR' : _SETROARSCENARIOINDEXREQUEST, - '__module__' : 'control_tests_pb2' - # @@protoc_insertion_point(class_scope:SetRoarScenarioIndexRequest) - }) -_sym_db.RegisterMessage(SetRoarScenarioIndexRequest) - -GetLastSnippetImageResponse = _reflection.GeneratedProtocolMessageType('GetLastSnippetImageResponse', (_message.Message,), { - 'DESCRIPTOR' : _GETLASTSNIPPETIMAGERESPONSE, - '__module__' : 'control_tests_pb2' - # @@protoc_insertion_point(class_scope:GetLastSnippetImageResponse) - }) -_sym_db.RegisterMessage(GetLastSnippetImageResponse) - -GetLastAsaUploadResponse = _reflection.GeneratedProtocolMessageType('GetLastAsaUploadResponse', (_message.Message,), { - 'DESCRIPTOR' : _GETLASTASAUPLOADRESPONSE, - '__module__' : 'control_tests_pb2' - # @@protoc_insertion_point(class_scope:GetLastAsaUploadResponse) - }) -_sym_db.RegisterMessage(GetLastAsaUploadResponse) - -DumpVsavRequest = _reflection.GeneratedProtocolMessageType('DumpVsavRequest', (_message.Message,), { - 'DESCRIPTOR' : _DUMPVSAVREQUEST, - '__module__' : 'control_tests_pb2' - # @@protoc_insertion_point(class_scope:DumpVsavRequest) - }) -_sym_db.RegisterMessage(DumpVsavRequest) - -DumpVsavResponse = _reflection.GeneratedProtocolMessageType('DumpVsavResponse', (_message.Message,), { - 'DESCRIPTOR' : _DUMPVSAVRESPONSE, - '__module__' : 'control_tests_pb2' - # @@protoc_insertion_point(class_scope:DumpVsavResponse) - }) -_sym_db.RegisterMessage(DumpVsavResponse) - -GetVaslPiecesRequest = _reflection.GeneratedProtocolMessageType('GetVaslPiecesRequest', (_message.Message,), { - 'DESCRIPTOR' : _GETVASLPIECESREQUEST, - '__module__' : 'control_tests_pb2' - # @@protoc_insertion_point(class_scope:GetVaslPiecesRequest) - }) -_sym_db.RegisterMessage(GetVaslPiecesRequest) - -GetVaslPiecesResponse = _reflection.GeneratedProtocolMessageType('GetVaslPiecesResponse', (_message.Message,), { - 'DESCRIPTOR' : _GETVASLPIECESRESPONSE, - '__module__' : 'control_tests_pb2' - # @@protoc_insertion_point(class_scope:GetVaslPiecesResponse) - }) -_sym_db.RegisterMessage(GetVaslPiecesResponse) - -GetAppConfigResponse = _reflection.GeneratedProtocolMessageType('GetAppConfigResponse', (_message.Message,), { - 'DESCRIPTOR' : _GETAPPCONFIGRESPONSE, - '__module__' : 'control_tests_pb2' - # @@protoc_insertion_point(class_scope:GetAppConfigResponse) - }) -_sym_db.RegisterMessage(GetAppConfigResponse) - -SetAppConfigValRequest = _reflection.GeneratedProtocolMessageType('SetAppConfigValRequest', (_message.Message,), { - 'DESCRIPTOR' : _SETAPPCONFIGVALREQUEST, - '__module__' : 'control_tests_pb2' - # @@protoc_insertion_point(class_scope:SetAppConfigValRequest) - }) -_sym_db.RegisterMessage(SetAppConfigValRequest) - -DeleteAppConfigValRequest = _reflection.GeneratedProtocolMessageType('DeleteAppConfigValRequest', (_message.Message,), { - 'DESCRIPTOR' : _DELETEAPPCONFIGVALREQUEST, - '__module__' : 'control_tests_pb2' - # @@protoc_insertion_point(class_scope:DeleteAppConfigValRequest) - }) -_sym_db.RegisterMessage(DeleteAppConfigValRequest) - -SaveTempFileRequest = _reflection.GeneratedProtocolMessageType('SaveTempFileRequest', (_message.Message,), { - 'DESCRIPTOR' : _SAVETEMPFILEREQUEST, - '__module__' : 'control_tests_pb2' - # @@protoc_insertion_point(class_scope:SaveTempFileRequest) - }) -_sym_db.RegisterMessage(SaveTempFileRequest) - - - -_CONTROLTESTS = _descriptor.ServiceDescriptor( - name='ControlTests', - full_name='ControlTests', - file=DESCRIPTOR, - index=0, - serialized_options=None, - create_key=_descriptor._internal_create_key, - serialized_start=1746, - serialized_end=3547, - methods=[ - _descriptor.MethodDescriptor( - name='startTests', - full_name='ControlTests.startTests', - index=0, - containing_service=None, - input_type=google_dot_protobuf_dot_empty__pb2._EMPTY, - output_type=_STARTTESTSRESPONSE, - serialized_options=None, - create_key=_descriptor._internal_create_key, - ), - _descriptor.MethodDescriptor( - name='endTests', - full_name='ControlTests.endTests', - index=1, - containing_service=None, - input_type=google_dot_protobuf_dot_empty__pb2._EMPTY, - output_type=google_dot_protobuf_dot_empty__pb2._EMPTY, - serialized_options=None, - create_key=_descriptor._internal_create_key, - ), - _descriptor.MethodDescriptor( - name='getVassalVersions', - full_name='ControlTests.getVassalVersions', - index=2, - containing_service=None, - input_type=google_dot_protobuf_dot_empty__pb2._EMPTY, - output_type=_GETVASSALVERSIONSRESPONSE, - serialized_options=None, - create_key=_descriptor._internal_create_key, - ), - _descriptor.MethodDescriptor( - name='setVassalVersion', - full_name='ControlTests.setVassalVersion', - index=3, - containing_service=None, - input_type=_SETVASSALVERSIONREQUEST, - output_type=google_dot_protobuf_dot_empty__pb2._EMPTY, - serialized_options=None, - create_key=_descriptor._internal_create_key, - ), - _descriptor.MethodDescriptor( - name='getVaslVersions', - full_name='ControlTests.getVaslVersions', - index=4, - containing_service=None, - input_type=google_dot_protobuf_dot_empty__pb2._EMPTY, - output_type=_GETVASLVERSIONSRESPONSE, - serialized_options=None, - create_key=_descriptor._internal_create_key, - ), - _descriptor.MethodDescriptor( - name='setVaslVersion', - full_name='ControlTests.setVaslVersion', - index=5, - containing_service=None, - input_type=_SETVASLVERSIONREQUEST, - output_type=google_dot_protobuf_dot_empty__pb2._EMPTY, - serialized_options=None, - create_key=_descriptor._internal_create_key, - ), - _descriptor.MethodDescriptor( - name='getVaslExtns', - full_name='ControlTests.getVaslExtns', - index=6, - containing_service=None, - input_type=google_dot_protobuf_dot_empty__pb2._EMPTY, - output_type=_GETVASLEXTNSRESPONSE, - serialized_options=None, - create_key=_descriptor._internal_create_key, - ), - _descriptor.MethodDescriptor( - name='setVaslExtnInfoDir', - full_name='ControlTests.setVaslExtnInfoDir', - index=7, - containing_service=None, - input_type=_SETVASLEXTNINFODIRREQUEST, - output_type=google_dot_protobuf_dot_empty__pb2._EMPTY, - serialized_options=None, - create_key=_descriptor._internal_create_key, - ), - _descriptor.MethodDescriptor( - name='setGpidRemappings', - full_name='ControlTests.setGpidRemappings', - index=8, - containing_service=None, - input_type=_SETGPIDREMAPPINGSREQUEST, - output_type=google_dot_protobuf_dot_empty__pb2._EMPTY, - serialized_options=None, - create_key=_descriptor._internal_create_key, - ), - _descriptor.MethodDescriptor( - name='getVaslModWarnings', - full_name='ControlTests.getVaslModWarnings', - index=9, - containing_service=None, - input_type=google_dot_protobuf_dot_empty__pb2._EMPTY, - output_type=_GETVASLMODWARNINGSRESPONSE, - serialized_options=None, - create_key=_descriptor._internal_create_key, - ), - _descriptor.MethodDescriptor( - name='setDataDir', - full_name='ControlTests.setDataDir', - index=10, - containing_service=None, - input_type=_SETDATADIRREQUEST, - output_type=google_dot_protobuf_dot_empty__pb2._EMPTY, - serialized_options=None, - create_key=_descriptor._internal_create_key, - ), - _descriptor.MethodDescriptor( - name='setDefaultScenario', - full_name='ControlTests.setDefaultScenario', - index=11, - containing_service=None, - input_type=_SETDEFAULTSCENARIOREQUEST, - output_type=google_dot_protobuf_dot_empty__pb2._EMPTY, - serialized_options=None, - create_key=_descriptor._internal_create_key, - ), - _descriptor.MethodDescriptor( - name='setDefaultTemplatePack', - full_name='ControlTests.setDefaultTemplatePack', - index=12, - containing_service=None, - input_type=_SETDEFAULTTEMPLATEPACKREQUEST, - output_type=google_dot_protobuf_dot_empty__pb2._EMPTY, - serialized_options=None, - create_key=_descriptor._internal_create_key, - ), - _descriptor.MethodDescriptor( - name='setVehOrdNotesDir', - full_name='ControlTests.setVehOrdNotesDir', - index=13, - containing_service=None, - input_type=_SETVEHORDNOTESDIRREQUEST, - output_type=google_dot_protobuf_dot_empty__pb2._EMPTY, - serialized_options=None, - create_key=_descriptor._internal_create_key, - ), - _descriptor.MethodDescriptor( - name='setUserFilesDir', - full_name='ControlTests.setUserFilesDir', - index=14, - containing_service=None, - input_type=_SETUSERFILESDIRREQUEST, - output_type=google_dot_protobuf_dot_empty__pb2._EMPTY, - serialized_options=None, - create_key=_descriptor._internal_create_key, - ), - _descriptor.MethodDescriptor( - name='setAsaScenarioIndex', - full_name='ControlTests.setAsaScenarioIndex', - index=15, - containing_service=None, - input_type=_SETASASCENARIOINDEXREQUEST, - output_type=google_dot_protobuf_dot_empty__pb2._EMPTY, - serialized_options=None, - create_key=_descriptor._internal_create_key, - ), - _descriptor.MethodDescriptor( - name='setRoarScenarioIndex', - full_name='ControlTests.setRoarScenarioIndex', - index=16, - containing_service=None, - input_type=_SETROARSCENARIOINDEXREQUEST, - output_type=google_dot_protobuf_dot_empty__pb2._EMPTY, - serialized_options=None, - create_key=_descriptor._internal_create_key, - ), - _descriptor.MethodDescriptor( - name='getLastSnippetImage', - full_name='ControlTests.getLastSnippetImage', - index=17, - containing_service=None, - input_type=google_dot_protobuf_dot_empty__pb2._EMPTY, - output_type=_GETLASTSNIPPETIMAGERESPONSE, - serialized_options=None, - create_key=_descriptor._internal_create_key, - ), - _descriptor.MethodDescriptor( - name='resetLastAsaUpload', - full_name='ControlTests.resetLastAsaUpload', - index=18, - containing_service=None, - input_type=google_dot_protobuf_dot_empty__pb2._EMPTY, - output_type=google_dot_protobuf_dot_empty__pb2._EMPTY, - serialized_options=None, - create_key=_descriptor._internal_create_key, - ), - _descriptor.MethodDescriptor( - name='getLastAsaUpload', - full_name='ControlTests.getLastAsaUpload', - index=19, - containing_service=None, - input_type=google_dot_protobuf_dot_empty__pb2._EMPTY, - output_type=_GETLASTASAUPLOADRESPONSE, - serialized_options=None, - create_key=_descriptor._internal_create_key, - ), - _descriptor.MethodDescriptor( - name='dumpVsav', - full_name='ControlTests.dumpVsav', - index=20, - containing_service=None, - input_type=_DUMPVSAVREQUEST, - output_type=_DUMPVSAVRESPONSE, - serialized_options=None, - create_key=_descriptor._internal_create_key, - ), - _descriptor.MethodDescriptor( - name='getVaslPieces', - full_name='ControlTests.getVaslPieces', - index=21, - containing_service=None, - input_type=_GETVASLPIECESREQUEST, - output_type=_GETVASLPIECESRESPONSE, - serialized_options=None, - create_key=_descriptor._internal_create_key, - ), - _descriptor.MethodDescriptor( - name='getAppConfig', - full_name='ControlTests.getAppConfig', - index=22, - containing_service=None, - input_type=google_dot_protobuf_dot_empty__pb2._EMPTY, - output_type=_GETAPPCONFIGRESPONSE, - serialized_options=None, - create_key=_descriptor._internal_create_key, - ), - _descriptor.MethodDescriptor( - name='setAppConfigVal', - full_name='ControlTests.setAppConfigVal', - index=23, - containing_service=None, - input_type=_SETAPPCONFIGVALREQUEST, - output_type=google_dot_protobuf_dot_empty__pb2._EMPTY, - serialized_options=None, - create_key=_descriptor._internal_create_key, - ), - _descriptor.MethodDescriptor( - name='deleteAppConfigVal', - full_name='ControlTests.deleteAppConfigVal', - index=24, - containing_service=None, - input_type=_DELETEAPPCONFIGVALREQUEST, - output_type=google_dot_protobuf_dot_empty__pb2._EMPTY, - serialized_options=None, - create_key=_descriptor._internal_create_key, - ), - _descriptor.MethodDescriptor( - name='saveTempFile', - full_name='ControlTests.saveTempFile', - index=25, - containing_service=None, - input_type=_SAVETEMPFILEREQUEST, - output_type=google_dot_protobuf_dot_empty__pb2._EMPTY, - serialized_options=None, - create_key=_descriptor._internal_create_key, - ), -]) -_sym_db.RegisterServiceDescriptor(_CONTROLTESTS) - -DESCRIPTOR.services_by_name['ControlTests'] = _CONTROLTESTS - +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x13\x63ontrol_tests.proto\x1a\x1bgoogle/protobuf/empty.proto\"*\n\x12StartTestsResponse\x12\x14\n\x0c\x63\x61pabilities\x18\x01 \x03(\t\"3\n\x19GetVassalVersionsResponse\x12\x16\n\x0evassalVersions\x18\x01 \x03(\t\"0\n\x17SetVassalVersionRequest\x12\x15\n\rvassalVersion\x18\x01 \x01(\t\"/\n\x17GetVaslVersionsResponse\x12\x14\n\x0cvaslVersions\x18\x01 \x03(\t\"\x9c\x01\n\x15SetVaslVersionRequest\x12\x13\n\x0bvaslVersion\x18\x01 \x01(\t\x12;\n\rvaslExtnsType\x18\x02 \x01(\x0e\x32$.SetVaslVersionRequest.VaslExtnsType\"1\n\rVaslExtnsType\x12\x08\n\x04NONE\x10\x00\x12\x08\n\x04REAL\x10\x01\x12\x0c\n\x08TEMP_DIR\x10\x02\"-\n\x14GetVaslExtnsResponse\x12\x15\n\rvaslExtnsJson\x18\x01 \x01(\t\",\n\x19SetVaslExtnInfoDirRequest\x12\x0f\n\x07\x64irName\x18\x01 \x01(\t\"6\n\x18SetGpidRemappingsRequest\x12\x1a\n\x12gpidRemappingsJson\x18\x01 \x01(\t\".\n\x1aGetVaslModWarningsResponse\x12\x10\n\x08warnings\x18\x01 \x03(\t\"_\n\x11SetDataDirRequest\x12+\n\x07\x64irType\x18\x01 \x01(\x0e\x32\x1a.SetDataDirRequest.DirType\"\x1d\n\x07\x44irType\x12\x08\n\x04TEST\x10\x00\x12\x08\n\x04REAL\x10\x01\"-\n\x19SetDefaultScenarioRequest\x12\x10\n\x08\x66ileName\x18\x01 \x01(\t\"\xc9\x01\n\x1dSetDefaultTemplatePackRequest\x12K\n\x10templatePackType\x18\x01 \x01(\x0e\x32/.SetDefaultTemplatePackRequest.TemplatePackTypeH\x00\x12\x11\n\x07\x64irName\x18\x02 \x01(\tH\x00\x12\x11\n\x07zipData\x18\x03 \x01(\x0cH\x00\")\n\x10TemplatePackType\x12\x0b\n\x07\x44\x45\x46\x41ULT\x10\x00\x12\x08\n\x04REAL\x10\x01\x42\n\n\x08tp_oneof\"w\n\x18SetVehOrdNotesDirRequest\x12\x32\n\x07\x64irType\x18\x01 \x01(\x0e\x32!.SetVehOrdNotesDirRequest.DirType\"\'\n\x07\x44irType\x12\x08\n\x04NONE\x10\x00\x12\x08\n\x04TEST\x10\x01\x12\x08\n\x04REAL\x10\x02\"*\n\x16SetUserFilesDirRequest\x12\x10\n\x08\x64irOrUrl\x18\x01 \x01(\t\".\n\x1aSetAsaScenarioIndexRequest\x12\x10\n\x08\x66ileName\x18\x01 \x01(\t\"/\n\x1bSetRoarScenarioIndexRequest\x12\x10\n\x08\x66ileName\x18\x01 \x01(\t\"0\n\x1bGetLastSnippetImageResponse\x12\x11\n\timageData\x18\x01 \x01(\x0c\"2\n\x18GetLastAsaUploadResponse\x12\x16\n\x0elastUploadJson\x18\x01 \x01(\t\"#\n\x0f\x44umpVsavRequest\x12\x10\n\x08vsavData\x18\x01 \x01(\x0c\"$\n\x10\x44umpVsavResponse\x12\x10\n\x08vsavDump\x18\x01 \x01(\t\"+\n\x14GetVaslPiecesRequest\x12\x13\n\x0bvaslVersion\x18\x01 \x01(\t\"9\n\x15GetVaslPiecesResponse\x12\x11\n\tpieceDump\x18\x01 \x01(\t\x12\r\n\x05gpids\x18\x02 \x03(\t\"-\n\x14GetAppConfigResponse\x12\x15\n\rappConfigJson\x18\x01 \x01(\t\"h\n\x16SetAppConfigValRequest\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x10\n\x06strVal\x18\x02 \x01(\tH\x00\x12\x10\n\x06intVal\x18\x03 \x01(\x05H\x00\x12\x11\n\x07\x62oolVal\x18\x04 \x01(\x08H\x00\x42\n\n\x08\x61\x63_oneof\"(\n\x19\x44\x65leteAppConfigValRequest\x12\x0b\n\x03key\x18\x01 \x01(\t\"5\n\x13SaveTempFileRequest\x12\x10\n\x08\x66ileName\x18\x01 \x01(\t\x12\x0c\n\x04\x64\x61ta\x18\x02 \x01(\x0c\x32\x89\x0e\n\x0c\x43ontrolTests\x12\x39\n\nstartTests\x12\x16.google.protobuf.Empty\x1a\x13.StartTestsResponse\x12:\n\x08\x65ndTests\x12\x16.google.protobuf.Empty\x1a\x16.google.protobuf.Empty\x12G\n\x11getVassalVersions\x12\x16.google.protobuf.Empty\x1a\x1a.GetVassalVersionsResponse\x12\x44\n\x10setVassalVersion\x12\x18.SetVassalVersionRequest\x1a\x16.google.protobuf.Empty\x12\x43\n\x0fgetVaslVersions\x12\x16.google.protobuf.Empty\x1a\x18.GetVaslVersionsResponse\x12@\n\x0esetVaslVersion\x12\x16.SetVaslVersionRequest\x1a\x16.google.protobuf.Empty\x12=\n\x0cgetVaslExtns\x12\x16.google.protobuf.Empty\x1a\x15.GetVaslExtnsResponse\x12H\n\x12setVaslExtnInfoDir\x12\x1a.SetVaslExtnInfoDirRequest\x1a\x16.google.protobuf.Empty\x12\x46\n\x11setGpidRemappings\x12\x19.SetGpidRemappingsRequest\x1a\x16.google.protobuf.Empty\x12I\n\x12getVaslModWarnings\x12\x16.google.protobuf.Empty\x1a\x1b.GetVaslModWarningsResponse\x12\x38\n\nsetDataDir\x12\x12.SetDataDirRequest\x1a\x16.google.protobuf.Empty\x12H\n\x12setDefaultScenario\x12\x1a.SetDefaultScenarioRequest\x1a\x16.google.protobuf.Empty\x12P\n\x16setDefaultTemplatePack\x12\x1e.SetDefaultTemplatePackRequest\x1a\x16.google.protobuf.Empty\x12\x46\n\x11setVehOrdNotesDir\x12\x19.SetVehOrdNotesDirRequest\x1a\x16.google.protobuf.Empty\x12\x42\n\x0fsetUserFilesDir\x12\x17.SetUserFilesDirRequest\x1a\x16.google.protobuf.Empty\x12J\n\x13setAsaScenarioIndex\x12\x1b.SetAsaScenarioIndexRequest\x1a\x16.google.protobuf.Empty\x12L\n\x14setRoarScenarioIndex\x12\x1c.SetRoarScenarioIndexRequest\x1a\x16.google.protobuf.Empty\x12K\n\x13getLastSnippetImage\x12\x16.google.protobuf.Empty\x1a\x1c.GetLastSnippetImageResponse\x12\x44\n\x12resetLastAsaUpload\x12\x16.google.protobuf.Empty\x1a\x16.google.protobuf.Empty\x12\x45\n\x10getLastAsaUpload\x12\x16.google.protobuf.Empty\x1a\x19.GetLastAsaUploadResponse\x12/\n\x08\x64umpVsav\x12\x10.DumpVsavRequest\x1a\x11.DumpVsavResponse\x12>\n\rgetVaslPieces\x12\x15.GetVaslPiecesRequest\x1a\x16.GetVaslPiecesResponse\x12=\n\x0cgetAppConfig\x12\x16.google.protobuf.Empty\x1a\x15.GetAppConfigResponse\x12\x42\n\x0fsetAppConfigVal\x12\x17.SetAppConfigValRequest\x1a\x16.google.protobuf.Empty\x12H\n\x12\x64\x65leteAppConfigVal\x12\x1a.DeleteAppConfigValRequest\x1a\x16.google.protobuf.Empty\x12<\n\x0csaveTempFile\x12\x14.SaveTempFileRequest\x1a\x16.google.protobuf.Emptyb\x06proto3') + +_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals()) +_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'control_tests_pb2', globals()) +if _descriptor._USE_C_DESCRIPTORS == False: + + DESCRIPTOR._options = None + _STARTTESTSRESPONSE._serialized_start=52 + _STARTTESTSRESPONSE._serialized_end=94 + _GETVASSALVERSIONSRESPONSE._serialized_start=96 + _GETVASSALVERSIONSRESPONSE._serialized_end=147 + _SETVASSALVERSIONREQUEST._serialized_start=149 + _SETVASSALVERSIONREQUEST._serialized_end=197 + _GETVASLVERSIONSRESPONSE._serialized_start=199 + _GETVASLVERSIONSRESPONSE._serialized_end=246 + _SETVASLVERSIONREQUEST._serialized_start=249 + _SETVASLVERSIONREQUEST._serialized_end=405 + _SETVASLVERSIONREQUEST_VASLEXTNSTYPE._serialized_start=356 + _SETVASLVERSIONREQUEST_VASLEXTNSTYPE._serialized_end=405 + _GETVASLEXTNSRESPONSE._serialized_start=407 + _GETVASLEXTNSRESPONSE._serialized_end=452 + _SETVASLEXTNINFODIRREQUEST._serialized_start=454 + _SETVASLEXTNINFODIRREQUEST._serialized_end=498 + _SETGPIDREMAPPINGSREQUEST._serialized_start=500 + _SETGPIDREMAPPINGSREQUEST._serialized_end=554 + _GETVASLMODWARNINGSRESPONSE._serialized_start=556 + _GETVASLMODWARNINGSRESPONSE._serialized_end=602 + _SETDATADIRREQUEST._serialized_start=604 + _SETDATADIRREQUEST._serialized_end=699 + _SETDATADIRREQUEST_DIRTYPE._serialized_start=670 + _SETDATADIRREQUEST_DIRTYPE._serialized_end=699 + _SETDEFAULTSCENARIOREQUEST._serialized_start=701 + _SETDEFAULTSCENARIOREQUEST._serialized_end=746 + _SETDEFAULTTEMPLATEPACKREQUEST._serialized_start=749 + _SETDEFAULTTEMPLATEPACKREQUEST._serialized_end=950 + _SETDEFAULTTEMPLATEPACKREQUEST_TEMPLATEPACKTYPE._serialized_start=897 + _SETDEFAULTTEMPLATEPACKREQUEST_TEMPLATEPACKTYPE._serialized_end=938 + _SETVEHORDNOTESDIRREQUEST._serialized_start=952 + _SETVEHORDNOTESDIRREQUEST._serialized_end=1071 + _SETVEHORDNOTESDIRREQUEST_DIRTYPE._serialized_start=1032 + _SETVEHORDNOTESDIRREQUEST_DIRTYPE._serialized_end=1071 + _SETUSERFILESDIRREQUEST._serialized_start=1073 + _SETUSERFILESDIRREQUEST._serialized_end=1115 + _SETASASCENARIOINDEXREQUEST._serialized_start=1117 + _SETASASCENARIOINDEXREQUEST._serialized_end=1163 + _SETROARSCENARIOINDEXREQUEST._serialized_start=1165 + _SETROARSCENARIOINDEXREQUEST._serialized_end=1212 + _GETLASTSNIPPETIMAGERESPONSE._serialized_start=1214 + _GETLASTSNIPPETIMAGERESPONSE._serialized_end=1262 + _GETLASTASAUPLOADRESPONSE._serialized_start=1264 + _GETLASTASAUPLOADRESPONSE._serialized_end=1314 + _DUMPVSAVREQUEST._serialized_start=1316 + _DUMPVSAVREQUEST._serialized_end=1351 + _DUMPVSAVRESPONSE._serialized_start=1353 + _DUMPVSAVRESPONSE._serialized_end=1389 + _GETVASLPIECESREQUEST._serialized_start=1391 + _GETVASLPIECESREQUEST._serialized_end=1434 + _GETVASLPIECESRESPONSE._serialized_start=1436 + _GETVASLPIECESRESPONSE._serialized_end=1493 + _GETAPPCONFIGRESPONSE._serialized_start=1495 + _GETAPPCONFIGRESPONSE._serialized_end=1540 + _SETAPPCONFIGVALREQUEST._serialized_start=1542 + _SETAPPCONFIGVALREQUEST._serialized_end=1646 + _DELETEAPPCONFIGVALREQUEST._serialized_start=1648 + _DELETEAPPCONFIGVALREQUEST._serialized_end=1688 + _SAVETEMPFILEREQUEST._serialized_start=1690 + _SAVETEMPFILEREQUEST._serialized_end=1743 + _CONTROLTESTS._serialized_start=1746 + _CONTROLTESTS._serialized_end=3547 # @@protoc_insertion_point(module_scope) diff --git a/vasl_templates/webapp/tests/proto/set_data_dir_request.py b/vasl_templates/webapp/tests/proto/set_data_dir_request.py index 97431a2..c7a2810 100644 --- a/vasl_templates/webapp/tests/proto/set_data_dir_request.py +++ b/vasl_templates/webapp/tests/proto/set_data_dir_request.py @@ -1,6 +1,6 @@ """ Injected functions for SetDataDirRequest. """ -from .generated.control_tests_pb2 import SetDataDirRequest +from .generated.control_tests_pb2 import SetDataDirRequest #pylint: disable=no-name-in-module from .utils import enum_to_string # --------------------------------------------------------------------- diff --git a/vasl_templates/webapp/tests/proto/set_default_template_pack_request.py b/vasl_templates/webapp/tests/proto/set_default_template_pack_request.py index 1b7426d..44d4d67 100644 --- a/vasl_templates/webapp/tests/proto/set_default_template_pack_request.py +++ b/vasl_templates/webapp/tests/proto/set_default_template_pack_request.py @@ -1,6 +1,6 @@ """ Injected functions for SetDefaultTemplatePackRequest. """ -from vasl_templates.webapp.tests.proto.generated.control_tests_pb2 import SetDefaultTemplatePackRequest +from vasl_templates.webapp.tests.proto.generated.control_tests_pb2 import SetDefaultTemplatePackRequest #pylint: disable=no-name-in-module from .utils import enum_to_string # --------------------------------------------------------------------- diff --git a/vasl_templates/webapp/tests/proto/set_vasl_version_request.py b/vasl_templates/webapp/tests/proto/set_vasl_version_request.py index f13ae4c..de26b9f 100644 --- a/vasl_templates/webapp/tests/proto/set_vasl_version_request.py +++ b/vasl_templates/webapp/tests/proto/set_vasl_version_request.py @@ -1,6 +1,6 @@ """ Injected functions for SetVaslVersionRequest. """ -from vasl_templates.webapp.tests.proto.generated.control_tests_pb2 import SetVaslVersionRequest +from vasl_templates.webapp.tests.proto.generated.control_tests_pb2 import SetVaslVersionRequest #pylint: disable=no-name-in-module from .utils import enum_to_string # --------------------------------------------------------------------- diff --git a/vasl_templates/webapp/tests/proto/set_veh_ord_notes_dir_request.py b/vasl_templates/webapp/tests/proto/set_veh_ord_notes_dir_request.py index 1b3a375..bbca19d 100644 --- a/vasl_templates/webapp/tests/proto/set_veh_ord_notes_dir_request.py +++ b/vasl_templates/webapp/tests/proto/set_veh_ord_notes_dir_request.py @@ -1,6 +1,6 @@ """ Injected functions for SetVehOrdNotesDirRequest. """ -from vasl_templates.webapp.tests.proto.generated.control_tests_pb2 import SetVehOrdNotesDirRequest +from vasl_templates.webapp.tests.proto.generated.control_tests_pb2 import SetVehOrdNotesDirRequest #pylint: disable=no-name-in-module from .utils import enum_to_string # --------------------------------------------------------------------- diff --git a/vasl_templates/webapp/tests/test_scenario_search.py b/vasl_templates/webapp/tests/test_scenario_search.py index e039598..2b9dce5 100644 --- a/vasl_templates/webapp/tests/test_scenario_search.py +++ b/vasl_templates/webapp/tests/test_scenario_search.py @@ -15,7 +15,8 @@ from vasl_templates.webapp.tests.test_vassal import run_vassal_tests from vasl_templates.webapp.tests.utils import init_webapp, select_tab, new_scenario, \ set_player, set_template_params, set_scenario_date, get_player_nat, get_theater, set_theater, \ get_turn_track_nturns, \ - wait_for, wait_for_elem, find_child, find_children, get_css_classes, set_stored_msg, click_dialog_button + wait_for, wait_for_elem, find_child, find_children, get_css_classes, set_stored_msg, click_dialog_button, \ + remove_url_params # --------------------------------------------------------------------- @@ -833,7 +834,7 @@ def _unload_scenario_card(): #pylint: disable=too-many-branches,too-many-locals # unload the icons icons = set( - c.get_attribute( "src" ) + remove_url_params( c.get_attribute( "src" ) ) for c in find_children( ".info .icons img", card ) ) if icons: diff --git a/vasl_templates/webapp/tests/test_vassal.py b/vasl_templates/webapp/tests/test_vassal.py index fc606e0..f301b79 100644 --- a/vasl_templates/webapp/tests/test_vassal.py +++ b/vasl_templates/webapp/tests/test_vassal.py @@ -5,7 +5,6 @@ import re import json import base64 import random -import typing.re #pylint: disable=import-error from vasl_templates.webapp.vassal import VassalShim from vasl_templates.webapp.utils import TempFile, change_extn, compare_version_strings @@ -963,7 +962,7 @@ def _check_vsav_dump( vsav_dump, expected, ignore=None ): # compare what we extracted from the dump with what's expected for snippet_id in expected: - if isinstance( expected[snippet_id], typing.re.Pattern ): + if isinstance( expected[snippet_id], re.Pattern ): rc = expected[snippet_id].search( labels[snippet_id] ) is not None else: assert isinstance( expected[snippet_id], str ) diff --git a/vasl_templates/webapp/tests/utils.py b/vasl_templates/webapp/tests/utils.py index 168651f..fbbfa35 100644 --- a/vasl_templates/webapp/tests/utils.py +++ b/vasl_templates/webapp/tests/utils.py @@ -749,6 +749,13 @@ def get_css_classes( elem ): classes = elem.get_attribute( "class" ) return classes.split() if classes else [] +def remove_url_params( url ): + """Remove parameters from a URL.""" + pos = url.find( "?" ) + if pos < 0: + return url + return url[:pos] + # --------------------------------------------------------------------- def get_all_loggers():