1c/OpenIntegrations
1
0
Fork 0
mirror of https://github.com/Bayselonarrend/OpenIntegrations.git synced 2024-12-25 02:42:28 +02:00
Code Issues Releases Activity

Main build (Jenkins)

Browse Source
This commit is contained in:
Vitaly the Alpaca (bot) 2024-12-15 11:14:30 +03:00
parent 8226c45fac
commit 9af24e8292
16 changed files with 5954 additions and 5874 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
.github/workflows/oint_test_full_en.yml vendored
View File

@ -1305,9 +1305,51 @@ jobs:
key: logs-S3
path: ./docs/en/results/S3
Testing-TCP:
runs-on: ubuntu-latest
needs: [Decode, Build]
steps:
- uses: actions/checkout@v2
- uses: otymko/setup-onescript@v1.4
with:
version: 1.9.1
- name: Получить тестовые данные из кэша
uses: actions/cache/restore@v3
with:
key: test-data
path: ./data.json
- name: Установить asserts и 1testrunner
run: |
opm install asserts
opm install 1testrunner
- name: Установить OInt
run: |
TEMP_DEB="$(mktemp)" &&
wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.16.1/oint_1.16.1_all_en.deb' &&
sudo dpkg -i "$TEMP_DEB"
rm -f "$TEMP_DEB"
- name: TCP Client
if: ${{ cancelled() }} == false
run: oscript /home/runner/.local/share/ovm/current/lib/1testrunner/src/main.os -run ./src/en/OInt/tests/Modules/internal/OPI_TestsCLI.os "CLI_TC_Client"
- name: Записать логи
if: ${{ cancelled() }} == false
uses: actions/cache/save@v3
with:
key: logs-TCP
path: ./docs/en/results/TCP
Encode:
runs-on: ubuntu-latest
needs: [Testing-Telegram,Testing-VK,Testing-Viber,Testing-Twitter,Testing-YandexDisk,Testing-GoogleWorkspace,Testing-GoogleCalendar,Testing-GoogleDrive,Testing-GoogleSheets,Testing-Notion,Testing-Slack,Testing-Airtable,Testing-Dropbox,Testing-Bitrix24,Testing-VkTeams,Testing-Ozon,Testing-Neocities,Testing-CDEK,Testing-YandexMetrika,Testing-S3]
needs: [Testing-Telegram,Testing-VK,Testing-Viber,Testing-Twitter,Testing-YandexDisk,Testing-GoogleWorkspace,Testing-GoogleCalendar,Testing-GoogleDrive,Testing-GoogleSheets,Testing-Notion,Testing-Slack,Testing-Airtable,Testing-Dropbox,Testing-Bitrix24,Testing-VkTeams,Testing-Ozon,Testing-Neocities,Testing-CDEK,Testing-YandexMetrika,Testing-S3,Testing-TCP]
if: ${{ always() }}
permissions:
contents: write
@ -1655,6 +1697,22 @@ jobs:
-H "X-GitHub-Api-Version: 2022-11-28" \
"https://api.github.com/repos/Bayselonarrend/OpenIntegrations/actions/caches?key=logs-S3"
- name: Получить логи TCP
uses: actions/cache/restore@v3
with:
key: logs-TCP
path: ./docs/en/results/TCP
- name: Очистка логов TCP
run: |
curl -L \
-X DELETE \
-H "Accept: application/vnd.github+json" \
-H "Authorization: Bearer ${{ secrets.TOKEN }}" \
-H "X-GitHub-Api-Version: 2022-11-28" \
"https://api.github.com/repos/Bayselonarrend/OpenIntegrations/actions/caches?key=logs-TCP"
- name: Записать данные
uses: stefanzweifel/git-auto-commit-action@v5
@ -1667,7 +1725,7 @@ jobs:
Clear-Cache:
runs-on: ubuntu-latest
needs: [Testing-Telegram, Testing-VK, Testing-Viber, Testing-Twitter, Testing-YandexDisk, Testing-GoogleWorkspace, Testing-GoogleCalendar, Testing-GoogleDrive, Testing-GoogleSheets, Testing-Notion, Testing-Slack, Testing-Airtable, Testing-Dropbox, Testing-Bitrix24, Testing-VkTeams, Testing-Ozon, Testing-Neocities, Testing-CDEK, Testing-YandexMetrika, Testing-S3, Encode]
needs: [Testing-Telegram, Testing-VK, Testing-Viber, Testing-Twitter, Testing-YandexDisk, Testing-GoogleWorkspace, Testing-GoogleCalendar, Testing-GoogleDrive, Testing-GoogleSheets, Testing-Notion, Testing-Slack, Testing-Airtable, Testing-Dropbox, Testing-Bitrix24, Testing-VkTeams, Testing-Ozon, Testing-Neocities, Testing-CDEK, Testing-YandexMetrika, Testing-S3, Testing-TCP, Encode]
if: ${{ always() }}
steps:
- name: Очистка основного кэша

11
ci/cli_ostesten
View File

@ -656,6 +656,17 @@ pipeline {
}
}
stage('Testing-TCP') {
steps {
catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
powershell encoding: 'UTF-8', script:'1testrunner -run "./src/en/OInt/tests/Modules/internal/OPI_TestsCLI.os" "CLI_TC_Client"'
}
}
}
}
post{
always{

11
ci/ostesten
View File

@ -656,6 +656,17 @@ pipeline {
}
}
stage('Testing-TCP') {
steps {
catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
powershell encoding: 'UTF-8', script:'1testrunner -run "./src/en/OInt/tests/Modules/internal/OPI_Tests.os" "TC_Client"'
}
}
}
}
post{
always{

11708
service/dictionaries/en.json
View File

File diff suppressed because it is too large Load Diff

2
src/en/OInt/core/Modules/OPI_TCP.os
View File

@ -107,7 +107,7 @@ Function ReadBinaryData(Val Connection
OPI_TypeConversion.GetNumber(MaxSize);
If TypeOf(Marker) = Type("String") Then
Marker = ПолучитьДвоичныеДанныеИзСтроки(Marker);
Marker = ПолучитьДвоичныеДанныеИзСтроки(Marker);
Else
OPI_TypeConversion.GetBinaryData(Marker);
EndIf;

2
src/en/OInt/tests/Modules/internal/OPI_Tests.os
View File

@ -14285,7 +14285,7 @@ Procedure CDEK_GetDeliveryAppointment(FunctionParameters)
// END
OPI_TestDataRetrieval.WriteLog(Result, "GetDeliveryAppointment", "CDEK");
OPI_TestDataRetrieval.Check_CdekOrder(Result);
OPI_TestDataRetrieval.Check_Map(Result);
EndProcedure

2
src/en/OInt/tests/Modules/internal/OPI_TestsCLI.os
View File

@ -16207,7 +16207,7 @@ Procedure CLI_CDEK_GetDeliveryAppointment(FunctionParameters)
// END
OPI_TestDataRetrieval.WriteLogCLI(Result, "GetDeliveryAppointment", "CDEK");
OPI_TestDataRetrieval.Check_CdekOrder(Result);
OPI_TestDataRetrieval.Check_Map(Result);
EndProcedure

8
src/en/OInt/tools/Modules/OPI_TestDataRetrieval.os
View File

@ -69,7 +69,7 @@ Function GetTestingSectionMapping() Export
Sections.Insert("CDEK" , 5);
Sections.Insert("YandexMetrika" , 5);
Sections.Insert("S3" , 5);
Sections.Insert("TCP" , 5);
Sections.Insert("TCP" , 5);
Return Sections;
@ -101,7 +101,7 @@ Function GetTestingSectionMappingGA() Export
Sections.Insert("CDEK" , StandardDependencies);
Sections.Insert("YandexMetrika" , StandardDependencies);
Sections.Insert("S3" , StandardDependencies);
Sections.Insert("TCP" , StandardDependencies);
Sections.Insert("TCP" , StandardDependencies);
Return Sections;
@ -129,7 +129,7 @@ Function GetTestTable() Export
Cdek = "CDEK";
Metrika = "YandexMetrika";
S3_ = "S3";
TCP = "TCP";
TCP = "TCP";
TestTable = New ValueTable;
TestTable.Columns.Add("Method");
@ -261,7 +261,7 @@ Function GetTestTable() Export
NewTest(TestTable, "AWS_CommonMethods" , "Common methods" , S3_);
NewTest(TestTable, "AWS_BucketsManagement" , "Buckets management" , S3_);
NewTest(TestTable, "AWS_ObjectsManagement" , "Objects management" , S3_);
NewTest(TestTable, "TC_Client" , "TCP Client" , TCP);
NewTest(TestTable, "TC_Client" , "TCP Client" , TCP);
Return TestTable;

2
src/en/OPI/src/CommonModules/OPI_TCP/Module.bsl
View File

@ -107,7 +107,7 @@ Function ReadBinaryData(Val Connection
OPI_TypeConversion.GetNumber(MaxSize);
If TypeOf(Marker) = Type("String") Then
Marker = GetBinaryDataFromString(Marker);
Marker = GetBinaryDataFromString(Marker);
Else
OPI_TypeConversion.GetBinaryData(Marker);
EndIf;

8
src/en/OPI/src/CommonModules/OPI_TestDataRetrieval/Module.bsl
View File

@ -69,7 +69,7 @@ Function GetTestingSectionMapping() Export
Sections.Insert("CDEK" , 5);
Sections.Insert("YandexMetrika" , 5);
Sections.Insert("S3" , 5);
Sections.Insert("TCP" , 5);
Sections.Insert("TCP" , 5);
Return Sections;
@ -101,7 +101,7 @@ Function GetTestingSectionMappingGA() Export
Sections.Insert("CDEK" , StandardDependencies);
Sections.Insert("YandexMetrika" , StandardDependencies);
Sections.Insert("S3" , StandardDependencies);
Sections.Insert("TCP" , StandardDependencies);
Sections.Insert("TCP" , StandardDependencies);
Return Sections;
@ -129,7 +129,7 @@ Function GetTestTable() Export
Cdek = "CDEK";
Metrika = "YandexMetrika";
S3_ = "S3";
TCP = "TCP";
TCP = "TCP";
TestTable = New ValueTable;
TestTable.Columns.Add("Method");
@ -261,7 +261,7 @@ Function GetTestTable() Export
NewTest(TestTable, "AWS_CommonMethods" , "Common methods" , S3_);
NewTest(TestTable, "AWS_BucketsManagement" , "Buckets management" , S3_);
NewTest(TestTable, "AWS_ObjectsManagement" , "Objects management" , S3_);
NewTest(TestTable, "TC_Client" , "TCP Client" , TCP);
NewTest(TestTable, "TC_Client" , "TCP Client" , TCP);
Return TestTable;

2
src/en/OPI/src/CommonModules/OPI_Tests/Module.bsl
View File

@ -14285,7 +14285,7 @@ Procedure CDEK_GetDeliveryAppointment(FunctionParameters)
// END
OPI_TestDataRetrieval.WriteLog(Result, "GetDeliveryAppointment", "CDEK");
OPI_TestDataRetrieval.Check_CdekOrder(Result);
OPI_TestDataRetrieval.Check_Map(Result);
EndProcedure

2
src/en/OPI/src/CommonModules/OPI_TestsCLI/Module.bsl
View File

@ -16207,7 +16207,7 @@ Procedure CLI_CDEK_GetDeliveryAppointment(FunctionParameters)
// END
OPI_TestDataRetrieval.WriteLogCLI(Result, "GetDeliveryAppointment", "CDEK");
OPI_TestDataRetrieval.Check_CdekOrder(Result);
OPI_TestDataRetrieval.Check_Map(Result);
EndProcedure

2
src/ru/OInt/tests/Modules/internal/OPI_Тесты.os
View File

@ -14285,7 +14285,7 @@
// END
OPI_ПолучениеДанныхТестов.ЗаписатьЛог(Результат, "ПолучитьДоговоренностьОДоставке", "CDEK");
OPI_ПолучениеДанныхТестов.Проверка_СдэкЗаказ(Результат);
OPI_ПолучениеДанныхТестов.Проверка_Соответствие(Результат);
КонецПроцедуры

2
src/ru/OInt/tests/Modules/internal/OPI_ТестыCLI.os
View File

@ -16207,7 +16207,7 @@
// END
OPI_ПолучениеДанныхТестов.ЗаписатьЛогCLI(Результат, "ПолучитьДоговоренностьОДоставке", "CDEK");
OPI_ПолучениеДанныхТестов.Проверка_СдэкЗаказ(Результат);
OPI_ПолучениеДанныхТестов.Проверка_Соответствие(Результат);
КонецПроцедуры

2
src/ru/OInt/tools/Modules/OPI_ПолучениеДанныхТестов.os
View File

@ -129,7 +129,7 @@
Сдэк = "CDEK";
Метрика = "YandexMetrika";
S3_ = "S3";
TCP = "TCP";
TCP = "TCP";
ТаблицаТестов = Новый ТаблицаЗначений;
ТаблицаТестов.Колонки.Добавить("Метод");

2
src/ru/OPI/src/CommonModules/OPI_ПолучениеДанныхТестов/Module.bsl
View File

@ -129,7 +129,7 @@
Сдэк = "CDEK";
Метрика = "YandexMetrika";
S3_ = "S3";
TCP = "TCP";
TCP = "TCP";
ТаблицаТестов = Новый ТаблицаЗначений;
ТаблицаТестов.Колонки.Добавить("Метод");