Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix duplicate migration files #4230

Merged
merged 1 commit into from
Feb 27, 2024
Merged

Fix duplicate migration files #4230

merged 1 commit into from
Feb 27, 2024

Conversation

NelsonVides
Copy link
Collaborator

These were duplicated in two different PRs, unify them here

Copy link

codecov bot commented Feb 26, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 84.35%. Comparing base (880776f) to head (5ba68f2).

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #4230      +/-   ##
==========================================
- Coverage   84.37%   84.35%   -0.02%     
==========================================
  Files         552      552              
  Lines       33484    33484              
==========================================
- Hits        28251    28245       -6     
- Misses       5233     5239       +6     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@mongoose-im
Copy link
Collaborator

mongoose-im commented Feb 26, 2024

elasticsearch_and_cassandra_26 / elasticsearch_and_cassandra_mnesia / 5ba68f2
Reports root/ big
OK: 417 / Failed: 0 / User-skipped: 43 / Auto-skipped: 0


small_tests_25 / small_tests / 5ba68f2
Reports root / small


small_tests_26 / small_tests / 5ba68f2
Reports root / small


small_tests_26_arm64 / small_tests / 5ba68f2
Reports root / small


dynamic_domains_pgsql_mnesia_25 / pgsql_mnesia / 5ba68f2
Reports root/ big
OK: 4421 / Failed: 0 / User-skipped: 111 / Auto-skipped: 0


ldap_mnesia_25 / ldap_mnesia / 5ba68f2
Reports root/ big
OK: 2275 / Failed: 0 / User-skipped: 856 / Auto-skipped: 0


ldap_mnesia_26 / ldap_mnesia / 5ba68f2
Reports root/ big
OK: 2275 / Failed: 0 / User-skipped: 856 / Auto-skipped: 0


dynamic_domains_mysql_redis_26 / mysql_redis / 5ba68f2
Reports root/ big
OK: 4387 / Failed: 1 / User-skipped: 144 / Auto-skipped: 0

carboncopy_SUITE:one2one:dropped_client_doesnt_create_duplicate_carbons
{error,
  {{badmatch,
     [{xmlel,<<"message">>,
        [{<<"from">>,
        <<"alice_dropped_client_doesnt_create_duplicate_carbons_589@domain.example.com">>},
         {<<"to">>,
        <<"alice_dropped_client_doesnt_create_duplicate_carbons_589@domain.example.com/res2">>},
         {<<"xmlns">>,<<"jabber:client">>},
         {<<"type">>,<<"chat">>}],
        [{xmlel,<<"sent">>,
           [{<<"xmlns">>,<<"urn:xmpp:carbons:2">>}],
           [{xmlel,<<"forwarded">>,
            [{<<"xmlns">>,<<"urn:xmpp:forward:0">>}],
            [{xmlel,<<"message">>,
               [{<<"from">>,
                 <<"alice_dropped_client_doesnt_create_duplicate_carbons_589@domain.example.com/res1">>},
                {<<"type">>,<<"chat">>},
                {<<"to">>,
                 <<"bob_dropped_client_doesnt_create_duplicate_carbons_589@domain.example.com/res1">>},
                {<<"xmlns">>,<<"jabber:client">>}],
               [{xmlel,<<"body">>,[],
                  [{xmlcdata,
                     <<"And pious action">>}]}]}]}]}]}]},
   [{carboncopy_SUITE,
      '-dropped_client_doesnt_create_duplicate_carbons/1-fun-0-',4,
      [{file,
         "/home/circleci/project/big_tests/tests/carboncopy_SUITE.erl"},
       {line,189}]},
    {escalus_story,story,4,
      [{file,
         "/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_story.erl"},
       {line,72}]},
    {test_server,ts_tc,3,[{file,"test_server.erl"},{line,1793}]},
    {test_server,run_test_c...

Report log


dynamic_domains_pgsql_mnesia_26 / pgsql_mnesia / 5ba68f2
Reports root/ big
OK: 4421 / Failed: 0 / User-skipped: 111 / Auto-skipped: 0


pgsql_mnesia_25 / pgsql_mnesia / 5ba68f2
Reports root/ big
OK: 4810 / Failed: 0 / User-skipped: 118 / Auto-skipped: 0


internal_mnesia_26 / internal_mnesia / 5ba68f2
Reports root/ big
OK: 2415 / Failed: 0 / User-skipped: 716 / Auto-skipped: 0


dynamic_domains_mssql_mnesia_26 / odbc_mssql_mnesia / 5ba68f2
Reports root/ big
OK: 4417 / Failed: 1 / User-skipped: 114 / Auto-skipped: 0

muc_SUITE:register:user_unregisters_nick
{error,
  {{assertion_failed,assert,is_iq_result,
     [{xmlel,<<"iq">>,
        [{<<"type">>,<<"set">>},
         {<<"id">>,<<"21888ca632d3a455c1c6687f0afe9e32">>},
         {<<"to">>,<<"groupchats.domain.example.com">>}],
        [{xmlel,<<"query">>,
           [{<<"xmlns">>,<<"jabber:iq:register">>}],
           [{xmlel,<<"x">>,
            [{<<"xmlns">>,<<"jabber:x:data">>},
             {<<"type">>,<<"submit">>}],
            [{xmlel,<<"field">>,
               [{<<"type">>,<<"hidden">>},
                {<<"var">>,<<"FORM_TYPE">>}],
               [{xmlel,<<"value">>,[],
                  [{xmlcdata,<<"jabber:iq:register">>}]}]},
             {xmlel,<<"field">>,
               [{<<"type">>,<<"text-single">>},
                {<<"var">>,<<"nick">>}],
               [{xmlel,<<"value">>,[],
                  [{xmlcdata,
                     <<"thirdwitch1room-7fcf04dcc0">>}]}]}]}]}]}],
     {xmlel,<<"iq">>,
       [{<<"from">>,<<"groupchats.domain.example.com">>},
        {<<"to">>,
         <<"alice_user_unregisters_nick_2786@domain.example.com/res1">>},
        {<<"type">>,<<"error">>},
        {<<"id">>,<<"21888ca632d3a455c1c6687f0afe9e32">>}],
       [{xmlel,<<"query">>,
          [{<<"xmlns">>,<<"jabber:iq:register">>}],
          [{xmlel,<<"x">>,
             [{<<"xmlns">>,<<"jabber:x:data">>},
            {<<"type">>,<<"submit">>}],
             [{xmlel,<<"field">>,
              [{<<"type">>,<<"hidden">>},
               {<<"var">>,<<"FORM_TYPE">>}],
              ...

Report log


pgsql_cets_26 / pgsql_cets / 5ba68f2
Reports root/ big
OK: 4356 / Failed: 0 / User-skipped: 178 / Auto-skipped: 0


mysql_redis_26 / mysql_redis / 5ba68f2
Reports root/ big
OK: 4789 / Failed: 0 / User-skipped: 139 / Auto-skipped: 0


pgsql_mnesia_26 / pgsql_mnesia / 5ba68f2
Reports root/ big
OK: 4810 / Failed: 0 / User-skipped: 118 / Auto-skipped: 0


mssql_mnesia_26 / odbc_mssql_mnesia / 5ba68f2
Reports root/ big
OK: 4807 / Failed: 0 / User-skipped: 121 / Auto-skipped: 0


small_tests_25 / small_tests / 5ba68f2
Reports root / small


dynamic_domains_mysql_redis_26 / mysql_redis / 5ba68f2
Reports root/ big
OK: 4388 / Failed: 0 / User-skipped: 144 / Auto-skipped: 0


dynamic_domains_mssql_mnesia_26 / odbc_mssql_mnesia / 5ba68f2
Reports root/ big
OK: 4418 / Failed: 0 / User-skipped: 114 / Auto-skipped: 0

@NelsonVides NelsonVides marked this pull request as ready for review February 26, 2024 15:19
Copy link
Contributor

@jacekwegr jacekwegr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me! 👍

@jacekwegr jacekwegr merged commit b7ce0f9 into master Feb 27, 2024
4 checks passed
@jacekwegr jacekwegr deleted the fix_duplicate_migrations branch February 27, 2024 09:56
@jacekwegr jacekwegr added this to the 6.2.1 milestone Apr 3, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants